{"thread":{"id":"14543","subject":"[PATCH] Teach \"git-merge\" that \"stupid\" merge strategy no longer exists","startedAt":"2008-07-20T10:21:25Z","lastAt":"2008-07-20T18:50:05Z","messageCount":4,"participants":["Nanako Shiraishi","Miklos Vajna","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84013","messageId":"20080720192125.6117@nanako3.lavabit.com","threadId":"14543","inReplyTo":null,"subject":"[PATCH] Teach \"git-merge\" that \"stupid\" merge strategy no longer exists","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-07-20T10:21:25Z","receivedAt":"2008-07-20T10:21:25Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Next release 1.6.0 will not have \"stupid\" merge strategy, but\n\"git merge -s confused origin\" still includs it in the list of\navailable merge strategies.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n builtin-merge.c |    1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex 129b4e6..edc6016 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -54,7 +54,6 @@ static struct strategy all_strategy[] = {\n \t{ \"recursive\",  DEFAULT_TWOHEAD | NO_TRIVIAL },\n \t{ \"octopus\",    DEFAULT_OCTOPUS },\n \t{ \"resolve\",    0 },\n-\t{ \"stupid\",     0 },\n \t{ \"ours\",       NO_FAST_FORWARD | NO_TRIVIAL },\n \t{ \"subtree\",    NO_FAST_FORWARD | NO_TRIVIAL },\n };\n-- \n1.5.6.3\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"},{"id":"84027","messageId":"1216555968-31406-1-git-send-email-vmiklos@frugalware.org","threadId":"14543","inReplyTo":"20080720192125.6117@nanako3.lavabit.com","subject":"[PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-20T12:12:48Z","receivedAt":"2008-07-20T12:12:48Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"It co-existed with 'recursive' when rewriting it in C, but it no longer\navailable.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n\nOn Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> wrote:\n> -     { \"stupid\",     0 },\n\nIf we are at it, recur is also something unnecessary here.\n\n builtin-merge.c |    1 -\n 1 files changed, 0 insertions(+), 1 deletions(-)\n\ndiff --git a/builtin-merge.c b/builtin-merge.c\nindex 129b4e6..beba635 100644\n--- a/builtin-merge.c\n+++ b/builtin-merge.c\n@@ -50,7 +50,6 @@ static size_t use_strategies_nr, use_strategies_alloc;\n static const char *branch;\n \n static struct strategy all_strategy[] = {\n-\t{ \"recur\",      NO_TRIVIAL },\n \t{ \"recursive\",  DEFAULT_TWOHEAD | NO_TRIVIAL },\n \t{ \"octopus\",    DEFAULT_OCTOPUS },\n \t{ \"resolve\",    0 },\n-- \n1.5.6.2.450.g8d367.dirty\n"},{"id":"84048","messageId":"7vmykc76dn.fsf@gitster.siamese.dyndns.org","threadId":"14543","inReplyTo":"1216555968-31406-1-git-send-email-vmiklos@frugalware.org","subject":"Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-07-20T18:33:24Z","receivedAt":"2008-07-20T18:33:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Miklos Vajna <vmiklos@frugalware.org> writes:\n\n> It co-existed with 'recursive' when rewriting it in C, but it no longer\n> available.\n>\n> Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>\n> ---\n>\n> On Sun, Jul 20, 2008 at 07:21:25PM +0900, Nanako Shiraishi <nanako3@lavabit.com> wrote:\n>> -     { \"stupid\",     0 },\n>\n> If we are at it, recur is also something unnecessary here.\n\nGood eyes, both of you.  Will roll a die and commit one squashed,\ncreditting one of you at random ;-)\n"},{"id":"84050","messageId":"20080720185005.GN10347@genesis.frugalware.org","threadId":"14543","inReplyTo":"7vmykc76dn.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Teach 'git merge' that 'recur' merge strategy no longer exists","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-07-20T18:50:05Z","receivedAt":"2008-07-20T18:50:05Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Sun, Jul 20, 2008 at 11:33:24AM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> Good eyes, both of you.  Will roll a die and commit one squashed,\n> creditting one of you at random ;-)\n\nI thought commit messages can have multiple Signed-off-by lines. ;-)\n"}]}