diff options
Diffstat (limited to 'git-pull.sh')
| -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 ;; |