development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-28 03:59:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
... as discussed on the list for consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-03-18 02:07:59 -08:00
parent 8a414ad50c
commit f5ef535ff5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-pull.sh
View file

@ -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"