{"thread":{"id":"13536","subject":"[PATCH] Documentation: mention how to define multiple strategies","startedAt":"2008-05-15T22:10:17Z","lastAt":"2008-05-16T00:18:02Z","messageCount":3,"participants":["Miklos Vajna","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"77076","messageId":"1210889417-21370-1-git-send-email-vmiklos@frugalware.org","threadId":"13536","inReplyTo":null,"subject":"[PATCH] Documentation: mention how to define multiple strategies","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-15T22:10:17Z","receivedAt":"2008-05-15T22:10:17Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"pull.twohead and pull.octopus supports multiple default strategies but\nthis was undocumented and it was not obvious how to do so.\n\nSigned-off-by: Miklos Vajna <vmiklos@frugalware.org>\n---\n Documentation/config.txt |    4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 217980f..8a4abb2 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -924,10 +924,12 @@ pack.packSizeLimit::\n \n pull.octopus::\n \tThe default merge strategy to use when pulling multiple branches\n-\tat once.\n+\tat once. Multiple strategies can be defined using a space\n+\tseparated list.\n \n pull.twohead::\n \tThe default merge strategy to use when pulling a single branch.\n+\tMultiple strategies can be defined using a space separated list.\n \n remote.<name>.url::\n \tThe URL of a remote repository.  See linkgit:git-fetch[1] or\n-- \n1.5.5\n"},{"id":"77086","messageId":"7vfxsjf7zy.fsf@gitster.siamese.dyndns.org","threadId":"13536","inReplyTo":"1210889417-21370-1-git-send-email-vmiklos@frugalware.org","subject":"Re: [PATCH] Documentation: mention how to define multiple strategies","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-05-15T23:44:01Z","receivedAt":"2008-05-15T23:44:01Z","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> pull.twohead and pull.octopus supports multiple default strategies but\n> this was undocumented and it was not obvious how to do so.\n\nIt indeed is supported to give multiple strategies and let \"git merge\" try\neach of them.\n\nHowever, I have a very strong doubt if it is really worth keeping the\nsupport, let alone advertising it.\n\nReally.  It was a fun experiment while it was being invented, but I never\nsaw any practical usefulness with it.\n"},{"id":"77090","messageId":"20080516001802.GS27724@genesis.frugalware.org","threadId":"13536","inReplyTo":"7vfxsjf7zy.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH] Documentation: mention how to define multiple strategies","fromName":"Miklos Vajna","fromEmail":"vmiklos@frugalware.org","sentAt":"2008-05-16T00:18:02Z","receivedAt":"2008-05-16T00:18:02Z","isPatch":true,"sender":{"key":"vmiklos@frugalware.org","avatar":"https://gravatar.com/avatar/401c1cbbb3a5d13e650c691a2c71d6fd0b80df1a01bc74d9f1972675dd58f2bd?d=mp&s=160"},"body":"On Thu, May 15, 2008 at 04:44:01PM -0700, Junio C Hamano <gitster@pobox.com> wrote:\n> It indeed is supported to give multiple strategies and let \"git merge\" try\n> each of them.\n> \n> However, I have a very strong doubt if it is really worth keeping the\n> support, let alone advertising it.\n> \n> Really.  It was a fun experiment while it was being invented, but I never\n> saw any practical usefulness with it.\n\nAs a general rule, I try to change nothing while working on\nbuiltin-merge. Should I drop support for it (making an exception here),\nor will you accept tests for this, just you would like to exclude it\nfrom documentation?\n\nThanks.\n"}]}