... as discussed on the list for consistency.
Signed-off-by: Junio C Hamano <junkio@cox.net>
- 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
;;
*)
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"
if test -n "$var"
then
strategy_default_args="-s $var"