Thread (4 messages) flat view 4 messages, 3 authors, 2016-06-15

Re: git-merge adds test to a message -- bug?

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:44:25

Johannes Schindelin [off-list ref] writes:
On Sun, 23 Mar 2008, Junio C Hamano wrote:
quoted
I unfortunately do not recall why _prepend_, and not _replace_, had to be
the right behaviour.
http://article.gmane.org/gmane.comp.version-control.git/31896/match=git+merge+make+usable

Hth,
Ok, it helped.

So it was "my suspicion that people who would want to pass -m would want
it to behave this way".

I do not care deeply either way myself, as I never have found use for -m
to the merge command, but I think it could have been argued either way.
"If you want to include the standard message, you can do so yourself by
running the fmt-merge-msg yourself" would have been a valid argument too,
even though it would make it a lot more cumbersome if many people wanted
the standard message anyway.

I do not see any objections to the suspicion back then in the thread,
there may have been discussions and user requests that made me suspect
that nearby as well, and ever since the feature was defined that way there
wasn't any objection until Jörg brought this up.

So I'd say we should let the sleeping dog lie for now.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help