"Horst H. von Brand" <vonbrand@xxxxxxxxxxxx> writes: >> Most notably, $commit above can be any committish, so you can >> say for example: >> >> git merge js/shortlog~2 >> >> to merge early part of a topic branch without merging the rest >> of it. > > "Early part", i.e., branch js/shortlog up to js/shortlog~2 or just that one > commit? "Early part up to that commit" -- this is not a cherry pick. >> A custom merge message can be given with the new --message=<msg> >> parameter. The message is prepended in front of the usual >> "Merge ..." message autogenerated with fmt-merge-message. > > Why not -m too (consistency!)? That form also is accepted, I think. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html