diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-05 15:41:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-05 15:41:40 -0800 |
| commit | e7cf1da70f1bbb477614547ca2874392c9d37862 (patch) | |
| tree | ce5b6f363891b15fe7700841d25cfc31c7410bbf | |
| parent | 1456d964fa733dd35122a578d85b72e408108141 (diff) | |
| parent | b2f82e05de2512ae4adb63b669f6c1fe6cba3148 (diff) | |
| download | git-e7cf1da70f1bbb477614547ca2874392c9d37862.tar.gz git-e7cf1da70f1bbb477614547ca2874392c9d37862.tar.xz | |
Merge branch 'sr/force-rebase'
* sr/force-rebase:
Teach rebase to rebase even if upstream is up to date
| -rwxr-xr-x | git-rebase.sh | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 368c0ef43..c2a9b1fbe 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -3,7 +3,7 @@ # Copyright (c) 2005 Junio C Hamano. # -USAGE='[--interactive | -i] [-v] [--onto <newbase>] [<upstream>|--root] [<branch>]' +USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>]' LONG_USAGE='git-rebase replaces <branch> with a new branch of the same name. When the --onto option is provided the new branch starts out with a HEAD equal to <newbase>, otherwise it is equal to <upstream> @@ -48,6 +48,7 @@ prec=4 verbose= git_am_opt= rebase_root= +force_rebase= continue_merge () { test -n "$prev_head" || die "prev_head must be defined" @@ -294,6 +295,11 @@ do ;; --whitespace=*) git_am_opt="$git_am_opt $1" + case "$1" in + --whitespace=fix|--whitespace=strip) + force_rebase=t + ;; + esac ;; -C*) git_am_opt="$git_am_opt $1" @@ -301,6 +307,9 @@ do --root) rebase_root=t ;; + -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force_rebas|--force-rebase) + force_rebase=t + ;; -*) usage ;; @@ -420,10 +429,15 @@ if test "$upstream" = "$onto" && test "$mb" = "$onto" && # linear history? ! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null then - # Lazily switch to the target branch if needed... - test -z "$switch_to" || git checkout "$switch_to" - echo >&2 "Current branch $branch_name is up to date." - exit 0 + if test -z "$force_rebase" + then + # Lazily switch to the target branch if needed... + test -z "$switch_to" || git checkout "$switch_to" + echo >&2 "Current branch $branch_name is up to date." + exit 0 + else + echo "Current branch $branch_name is up to date, rebase forced." + fi fi if test -n "$verbose" |