Merge branch 'maint'

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index 30fdc57310897207f2e931396d184e94b48ad2ef..698e82b116d64236b80b7d6b9ae687aadba07afe 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -17,6 +17,9 @@ test -z "$(git ls-files -u)" ||
        die "You are in the middle of a conflicted merge."
 
 strategy_args= no_summary= no_commit= squash= no_ff=
+curr_branch=$(git symbolic-ref -q HEAD)
+curr_branch_short=$(echo "$curr_branch" | sed "s|refs/heads/||")
+rebase=$(git config --bool branch.$curr_branch_short.rebase)
 while :
 do
        case "$1" in
@@ -52,6 +55,12 @@ do
                esac
                strategy_args="${strategy_args}-s $strategy "
                ;;
+       -r|--r|--re|--reb|--reba|--rebas|--rebase)
+               rebase=true
+               ;;
+       --no-r|--no-re|--no-reb|--no-reba|--no-rebas|--no-rebase)
+               rebase=false
+               ;;
        -h|--h|--he|--hel|--help)
                usage
                ;;
@@ -95,7 +104,6 @@ merge_head=$(sed -e '/       not-for-merge   /d' \
 
 case "$merge_head" in
 '')
-       curr_branch=$(git symbolic-ref -q HEAD)
        case $? in
          0) ;;
          1) echo >&2 "You are not currently on a branch; you must explicitly"
@@ -142,5 +150,6 @@ then
 fi
 
 merge_name=$(git fmt-merge-msg <"$GIT_DIR/FETCH_HEAD") || exit
+test true = "$rebase" && exec git-rebase $merge_head
 exec git-merge $no_summary $no_commit $squash $no_ff $strategy_args \
        "$merge_name" HEAD $merge_head