Re: What's cooking in git.git (Apr 2012, #05; Thu, 12)
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:36
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: What's cooking in git.git (Apr 2012, #05; Thu, 12) · Michal Kiedrowicz <hidden>
- 2016-06-15 · Re: What's cooking in git.git (Apr 2012, #05; Thu, 12) · Linus Torvalds <torvalds@linux-foundation.org>
- 2016-06-15 · Re: What's cooking in git.git (Apr 2012, #05; Thu, 12) · Junio C Hamano <hidden>
- 2016-06-15 · Re: What's cooking in git.git (Apr 2012, #05; Thu, 12) · Linus Torvalds <torvalds@linux-foundation.org>
- 2016-06-15 · Re: What's cooking in git.git (Apr 2012, #05; Thu, 12) · Junio C Hamano <hidden>
Linus Torvalds [off-list ref] writes:
So Ack on Michal's patch, but I think we also should do the appended
equivalent thing for the fast-forward test on top of it (it's
white-space damaged, sorry).
Trivially tested with
git merge HEAD^ HEAD^^
which did the wrong thing before, and now works.
And it seems to break 6028 ("merge -s ours" and "merge -s subtree"
up-to-date) X-<....