Merge branch 'jn/checkout-doc' into maint

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index 417a1a95cda1b997b5d468692e958d73b0468339..44f5c65fdb5e81c4b660a666c2edd71aa75c5c1a 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano.
 #
 
-USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]'
+USAGE='[--interactive | -i] [-v] [--force-rebase | -f] [--no-ff] [--onto <newbase>] [<upstream>|--root] [<branch>] [--quiet | -q]'
 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>
@@ -86,10 +86,8 @@ continue_merge () {
                        printf "Already applied: %0${prec}d " $msgnum
                fi
        fi
-       if test -z "$GIT_QUIET"
-       then
-               git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
-       fi
+       test -z "$GIT_QUIET" &&
+       GIT_PAGER='' git log --format=%s -1 "$cmt"
 
        prev_head=`git rev-parse HEAD^0`
        # save the resulting commit so we can read-tree on it later
@@ -154,6 +152,7 @@ move_to_original_branch () {
 
 finish_rb_merge () {
        move_to_original_branch
+       git notes copy --for-rewrite=rebase < "$dotest"/rewritten
        if test -x "$GIT_DIR"/hooks/post-rewrite &&
                test -s "$dotest"/rewritten; then
                "$GIT_DIR"/hooks/post-rewrite rebase < "$dotest"/rewritten
@@ -354,7 +353,7 @@ do
        --root)
                rebase_root=t
                ;;
-       -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)
+       -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase|--no-ff)
                force_rebase=t
                ;;
        --rerere-autoupdate|--no-rerere-autoupdate)