mirror of
https://github.com/git/git
synced 2024-09-13 21:34:42 +00:00
git-pull: run repo-config with dash form.
... as discussed on the list for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
8a414ad50c
commit
f5ef535ff5
|
@ -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…
Reference in a new issue