Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] git-merge: do up-to-date check also for strategies ours, subtree.

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:28

Junio C Hamano [off-list ref] writes:
Right now I do not have time to dig mailing list archive around
mid March 2006, and I do not recall the requestor's original
rationale, but I have a vague recollection that we added this
"no fast-forward check" specifically in response to a user
request.
I do not think of a valid reason not to apply your patch.  We
wanted to avoid the trivial-merge codepath, but that is not a
valid reason to record a fast forward situation as a merge of
any kind.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help