X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=git-pull.sh;h=d8b64d7a67a19f1821a26c3ec82c0953db717be6;hb=dc347e9f6a2c106bb684d93dfbc38e3f3df2795b;hp=9868a0bfb478707b361f664a252870b3d1939138;hpb=ce8781e8ab66fb90fb7baf8d953a4582a06571a7;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 9868a0bfb..d8b64d7a6 100755
--- 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