Browse Source

git-pull: run repo-config with dash form.

... as discussed on the list for consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Junio C Hamano 19 years ago
parent
commit
f5ef535ff5
  1. 4
      git-pull.sh

4
git-pull.sh

@ -70,14 +70,14 @@ case "$merge_head" in @@ -70,14 +70,14 @@ case "$merge_head" in
exit 0
;;
?*' '?*)
var=`git repo-config --get pull.octopus`
var=`git-repo-config --get pull.octopus`
if test -n "$var"
then
strategy_default_args="-s $var"
fi
;;
*)
var=`git repo-config --get pull.twohead`
var=`git-repo-config --get pull.twohead`
if test -n "$var"
then
strategy_default_args="-s $var"

Loading…
Cancel
Save