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

From: Junio C Hamano <junkio@cox.net>
Date: Oct 3, 2006, 22:35 UTC
Message-ID: <7v4pulm3j6.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <45228FEB.10602@codeweavers.com>

Robert Shearman <rob@codeweavers.com> writes:

Show 11 quoted lines

> Signed-off-by: Robert Shearman <rob@codeweavers.com>
> @@ -121,6 +121,9 @@ OPTIONS
>  	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

I initially was a bit surprised that you did not show diff between onto and our HEAD (i.e. show the damages contained in the topic you are rebasing that will be inflicted on upstream), but I think your way of showing the upstream changes makes more sense. From the workflow point of view, this is for people who rebase instead of pull, and when pulling we show what the upstream did while we were looking the other way, so this naturally matches that behaviour for rebase. I would say it is a good thinking.