X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-pull.sh;h=d8b64d7a67a19f1821a26c3ec82c0953db717be6;hb=5d6dfc7cb140a6eb90138334fab2245b69bc8bc4;hp=902fc4adb4b95d27c6ba6c63f40108702dd93f11;hpb=79cfe0c5c4920bf68da548ad0d5bcdb425ce8d5f;p=git.git

diff --git a/git-pull.sh b/git-pull.sh
index 902fc4adb..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
@@ -120,7 +124,7 @@ do
 	--d|--dr|--dry|--dry-|--dry-r|--dry-ru|--dry-run)
 		dry_run=--dry-run
 		;;
-	-h|--h|--he|--hel|--help|--help-|--help-a|--help-al|--help-all)
+	-h|--help-all)
 		usage
 		;;
 	*)