From: Miklos Vajna <vmiklos@frugalware.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Documentation: mention how to define multiple strategies
Date: Fri, 16 May 2008 00:10:17 +0200 [thread overview]
Message-ID: <1210889417-21370-1-git-send-email-vmiklos@frugalware.org> (raw)
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(-)
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
next reply other threads:[~2008-05-15 22:11 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-15 22:10 Miklos Vajna [this message]
2008-05-15 23:44 ` [PATCH] Documentation: mention how to define multiple strategies Junio C Hamano
2008-05-16 0:18 ` Miklos Vajna
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1210889417-21370-1-git-send-email-vmiklos@frugalware.org \
--to=vmiklos@frugalware.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).