X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=d8b64d7a67a19f1821a26c3ec82c0953db717be6;hb=dc347e9f6a2c106bb684d93dfbc38e3f3df2795b;hp=8c1370f81bfa95832de99d78aa3bee4f763b821a;hpb=0fd8cb3fec7abb36505a150fe5cfa9b1d8b85496;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 8c1370f81..d8b64d7a6 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -11,7 +11,7 @@ OPTIONS_SPEC=
 . git-sh-setup
 . git-sh-i18n
 set_reflog_action "pull${1+ $*}"
-require_work_tree
+require_work_tree_exists
 cd_to_toplevel
 
 
@@ -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