projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge part of 'jc/diff'
[git.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index
0991d5f
..
6caf1aa
100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-70,21
+70,21
@@
case "$merge_head" in
exit 0
;;
?*' '?*)
exit 0
;;
?*' '?*)
- var=`git
-var -l | sed -ne 's/^pull\.octopus=/-s /p'
`
+ var=`git
repo-config --get pull.octopus
`
if test '' = "$var"
then
strategy_default_args='-s octopus'
else
if test '' = "$var"
then
strategy_default_args='-s octopus'
else
- strategy_default_args=
$var
+ strategy_default_args=
"-s $var"
fi
;;
*)
fi
;;
*)
- var=`git
-var -l | sed -ne 's/^pull\.twohead=/-s /p'
`
+ var=`git
repo-config --get pull.twohead
`
if test '' = "$var"
then
strategy_default_args='-s recursive'
else
if test '' = "$var"
then
strategy_default_args='-s recursive'
else
- strategy_default_args=
$var
+ strategy_default_args=
"-s $var"
fi
;;
esac
fi
;;
esac