git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.

Signed-off-by: Robert Shearman <rob@codeweavers.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 9d7bcaa38cc5c13e29c00ddd18c64202e98cb5f8..10f2924f4df1eb29c1baf4484d2837377b6cfcb3 100644 (file)
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -7,7 +7,7 @@ git-rebase - Rebase local commits to a new head
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git-rebase' [--merge] [--onto <newbase>] <upstream> [<branch>]
+'git-rebase' [-v] [--merge] [--onto <newbase>] <upstream> [<branch>]

 
 'git-rebase' --continue | --skip | --abort
 
 
 'git-rebase' --continue | --skip | --abort
 


@@ -121,6 +121,9 @@ OPTIONS
        is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).  This implies --merge.
 
        is used instead (`git-merge-recursive` when merging a single
        head, `git-merge-octopus` otherwise).  This implies --merge.
 

+-v, \--verbose::
+       Display a diffstat of what changed upstream since the last rebase.
+

 include::merge-strategies.txt[]
 
 NOTES
 include::merge-strategies.txt[]
 
 NOTES

diff --git a/git-rebase.sh b/git-rebase.sh
index 413636e2086a8c7274c0bc4cb04037f2e07f588e..546fa446fc3c6c63488b9ef38cb5bdc960953cb1 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -3,7 +3,7 @@
 # Copyright (c) 2005 Junio C Hamano.
 #
 
 # Copyright (c) 2005 Junio C Hamano.
 #
 

-USAGE='[--onto <newbase>] <upstream> [<branch>]'
+USAGE='[-v] [--onto <newbase>] <upstream> [<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>
 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>


@@ -39,6 +39,7 @@ strategy=recursive
 do_merge=
 dotest=$GIT_DIR/.dotest-merge
 prec=4
 do_merge=
 dotest=$GIT_DIR/.dotest-merge
 prec=4

+verbose=

 
 continue_merge () {
        test -n "$prev_head" || die "prev_head must be defined"
 
 continue_merge () {
        test -n "$prev_head" || die "prev_head must be defined"


@@ -190,6 +191,9 @@ do
                esac
                do_merge=t
                ;;
                esac
                do_merge=t
                ;;

+       -v|--verbose)
+               verbose=t
+               ;;

        -*)
                usage
                ;;
        -*)
                usage
                ;;


@@ -273,6 +277,12 @@ then
        exit 0
 fi
 
        exit 0
 fi
 

+if test -n "$verbose"
+then
+       echo "Changes from $mb to $onto:"
+       git-diff-tree --stat --summary "$mb" "$onto"
+fi
+

 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
 git-reset --hard "$onto"
 
 # Rewind the head to "$onto"; this saves our current head in ORIG_HEAD.
 git-reset --hard "$onto"