threads / patch / 13536

patchDocumentation: mention how to define multiple strategies

Subject: [PATCH] Documentation: mention how to define multiple strategies

## tl;dr

3 messages between May 15, 2008 and May 16, 2008. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Miklos Vajna· May 15, 2008, 22:10 UTC · lore

pull.twohead and pull.octopus supports multiple default strategies but this was undocumented and it was not obvious how to do so.

Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
 Documentation/config.txt |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Show changes to Documentation/config.txt +3 −1

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 217980f..8a4abb2 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -924,10 +924,12 @@ pack.packSizeLimit::
 
 pull.octopus::
 	The default merge strategy to use when pulling multiple branches
-	at once.
+	at once. Multiple strategies can be defined using a space
+	separated list.
 
 pull.twohead::
 	The default merge strategy to use when pulling a single branch.
+	Multiple strategies can be defined using a space separated list.
 
 remote.<name>.url::
 	The URL of a remote repository.  See linkgit:git-fetch[1] or

-- 
1.5.5

Junio C Hamano· May 15, 2008, 23:44 UTC · re: Miklos Vajna · lore

Re: [PATCH] Documentation: mention how to define multiple strategies

Miklos Vajna <vmiklos@frugalware.org> writes:

> pull.twohead and pull.octopus supports multiple default strategies but
> this was undocumented and it was not obvious how to do so.

It indeed is supported to give multiple strategies and let "git merge" try each of them.

However, I have a very strong doubt if it is really worth keeping the support, let alone advertising it.

Really. It was a fun experiment while it was being invented, but I never saw any practical usefulness with it.

Miklos Vajna· May 16, 2008, 00:18 UTC · re: Junio C Hamano · lore

Re: [PATCH] Documentation: mention how to define multiple strategies

On Thu, May 15, 2008 at 04:44:01PM -0700, Junio C Hamano <gitster@pobox.com> wrote:

Show 8 quoted lines

> It indeed is supported to give multiple strategies and let "git merge" try
> each of them.
> 
> However, I have a very strong doubt if it is really worth keeping the
> support, let alone advertising it.
> 
> Really.  It was a fun experiment while it was being invented, but I never
> saw any practical usefulness with it.

As a general rule, I try to change nothing while working on builtin-merge. Should I drop support for it (making an exception here), or will you accept tests for this, just you would like to exclude it from documentation?

Thanks.