Thread (1 message) 1 message, 1 author, 2016-08-11

Re: [PATCH] git-merge: make it usable as the first class UI

From: Junio C Hamano <hidden>
Date: 2016-08-11 20:04:55

"Horst H. von Brand" [off-list ref] writes:
quoted
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.
quoted
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.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help