diff options
| author |  Mark Hollomon <markhollomon@comcast.net> | 2006-03-15 22:51:41 +0000 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-03-15 16:14:33 -0800 |
| commit | c8e2db00f9622af6e5f640443dfbe63bb1af39e0 (patch) | |
| tree | 7c32c149066695f8cfa08abaa7a7a31f5118b0ac | |
| parent | Fix broken slot reuse when fetching alternates (diff) | |
| download | tgif-c8e2db00f9622af6e5f640443dfbe63bb1af39e0.tar.xz | |
Let merge set the default strategy.
If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.
[jc: with minor stylistic tweaks]
Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rwxr-xr-x | git-pull.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/git-pull.sh b/git-pull.sh index 6caf1aad47..17fda26721 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 -n "$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 -n "$var" + then strategy_default_args="-s $var" fi ;; |