kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into next 

* master:
  git-pull: run repo-config with dash form.
maint
Junio C Hamano 2006-03-18 02:08:10 -08:00
parent c534c4ba7e f5ef535ff5
commit 2fc27528f6
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 exit 0
;; ;;
?*' '?*) ?*' '?*)
var=`git repo-config --get pull.octopus` var=`git-repo-config --get pull.octopus`
if test -n "$var" if test -n "$var"
then then
strategy_default_args="-s $var" strategy_default_args="-s $var"
fi fi
;; ;;
*) *)
var=`git repo-config --get pull.twohead` var=`git-repo-config --get pull.twohead`
if test -n "$var" if test -n "$var"
then then
strategy_default_args="-s $var" strategy_default_args="-s $var"