mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-30 17:11:23 +02:00
Code

Merge branch 'master' into next

Browse Source 
* master:
  git-pull: run repo-config with dash form.
This commit is contained in:
Junio C Hamano 2006-03-18 02:08:10 -08:00
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
;;
?*' '?*)
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"