Skip to content

Commit

Permalink
git-pull: run repo-config with dash form.
Browse files Browse the repository at this point in the history
... as discussed on the list for consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Junio C Hamano committed Mar 18, 2006
1 parent 8a414ad commit f5ef535
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit f5ef535

Please sign in to comment.