Re: [PATCH] git-merge: make it usable as the first class UI
From: Horst H. von Brand <hidden>
Date: 2016-08-11 20:41:04
Junio C Hamano [off-list ref] wrote: [...]
-- >8 -- [PATCH] git-merge: make it usable as the first class UI This teaches the oft-requested syntax git merge $commit to implement merging the named commit to the current branch. This hopefully would make "git merge" usable as the first class UI instead of being a mere backend for "git pull". 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?
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!)? -- Dr. Horst H. von Brand User #22616 counter.li.org Departamento de Informatica Fono: +56 32 2654431 Universidad Tecnica Federico Santa Maria +56 32 2654239