projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8a414ad
)
git-pull: run repo-config with dash form.
author
Junio C Hamano
<junkio@cox.net>
Sat, 18 Mar 2006 10:07:59 +0000
(
02:07
-0800)
committer
Junio C Hamano
<junkio@cox.net>
Sat, 18 Mar 2006 10:07:59 +0000
(
02:07
-0800)
... as discussed on the list for consistency.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh
patch
|
blob
|
history
diff --git
a/git-pull.sh
b/git-pull.sh
index
17fda26
..
29c14e1
100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-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"