Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
pack_refs(): remove redundant check
[gitweb.git]
/
git-pull.sh
diff --git
a/git-pull.sh
b/git-pull.sh
index 9868a0bfb478707b361f664a252870b3d1939138..d8b64d7a67a19f1821a26c3ec82c0953db717be6 100755
(executable)
--- a/
git-pull.sh
+++ b/
git-pull.sh
@@
-44,6
+44,10
@@
merge_args=
curr_branch=$(git symbolic-ref -q HEAD)
curr_branch_short="${curr_branch#refs/heads/}"
rebase=$(git config --bool branch.$curr_branch_short.rebase)
+if test -z "$rebase"
+then
+ rebase=$(git config --bool pull.rebase)
+fi
dry_run=
while :
do