From: Mark Hollomon <markhollomon@comcast.net>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, markhollomon@comcast.net
Subject: [PATCH] Let merge set the default strategy.
Date: Wed, 15 Mar 2006 22:51:41 +0000 (UTC)
Date: Wed, Mar 15 17:51:43 2006 -0500 [thread overview]
Message-ID: <1142463103-6986-markhollomon@comcast.net> (raw)
If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.
This may be preferable to the earlier patch involving
NO_PYTHON.
Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
---
git-pull.sh | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
54e2c920b8ad979bc75d25ae73300be6077f46a0
diff --git a/git-pull.sh b/git-pull.sh
index 6caf1aa..7764b70 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -71,19 +71,15 @@ case "$merge_head" in
;;
?*' '?*)
var=`git repo-config --get pull.octopus`
- if test '' = "$var"
+ if test '' != "$var"
then
- strategy_default_args='-s octopus'
- else
strategy_default_args="-s $var"
fi
;;
*)
var=`git repo-config --get pull.twohead`
- if test '' = "$var"
- then
- strategy_default_args='-s recursive'
- else
+ if test '' != "$var"
+ then
strategy_default_args="-s $var"
fi
;;
--
1.2.4.gea75
next reply other threads:[~2006-03-15 22:51 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-15 22:51 Mark Hollomon [this message]
2006-03-15 23:40 ` [PATCH] Let merge set the default strategy Junio C Hamano
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=1142463103-6986-markhollomon@comcast.net \
--to=markhollomon@comcast.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
/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