Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

2 messages, 2 authors, 2016-06-15 · open the first message on its own page

Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

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

Miklos Vajna [off-list ref] writes:
It co-existed with 'recursive' when rewriting it in C, but it no longer
available.

Signed-off-by: Miklos Vajna <redacted>
---

On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi [off-list ref] wrote:
quoted
-     { "stupid",     0 },
If we are at it, recur is also something unnecessary here.
Good eyes, both of you.  Will roll a die and commit one squashed,
creditting one of you at random ;-)

Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists

From: Miklos Vajna <hidden>
Date: 2016-06-15 22:44:58

On Sun, Jul 20, 2008 at 11:33:24AM -0700, Junio C Hamano [off-list ref] wrote:
Good eyes, both of you.  Will roll a die and commit one squashed,
creditting one of you at random ;-)
I thought commit messages can have multiple Signed-off-by lines. ;-)
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help