pull: introduce a pull.rebase option to enable --rebase

diff --git a/git-pull.sh b/git-pull.sh
index fb9e2df9312e96ecf8ad5ab2bde4b74b979fe02e..277ed40cdb2d448fd8745972e30428bd266ed3b0 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -43,6 +43,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