From: Martin Waitz <tali@admingilde•org>
To: Junio C Hamano <junkio@cox•net>
Cc: Robert Shearman <rob@codeweavers•com>, git@vger•kernel.org
Subject: Re: [PATCH] git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase.
Date: Wed, 4 Oct 2006 08:59:43 +0200 [thread overview]
Message-ID: <20061004065943.GT2871@admingilde.org> (raw)
In-Reply-To: <7v4pulm3j6.fsf@assigned-by-dhcp.cox.net>
[-- Attachment #1: Type: text/plain, Size: 915 bytes --]
hoi :)
On Tue, Oct 03, 2006 at 03:35:09PM -0700, Junio C Hamano wrote:
> Robert Shearman <rob@codeweavers•com> writes:
> > +-v, \--verbose::
> > + Display a diffstat of what changed upstream since the last rebase.
> > +
>
> 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.
but perhaps we should use the same command line options as pull:
default to show the diffstat and use -n to suppress it?
--
Martin Waitz
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2006-10-04 6:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-03 16:29 [PATCH] git-rebase: Add a -v option to show a diffstat of the changes upstream at the start of a rebase Robert Shearman
2006-10-03 22:35 ` Junio C Hamano
2006-10-04 6:59 ` Martin Waitz [this message]
2006-10-04 7:13 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061004065943.GT2871@admingilde.org \
--to=tali@admingilde$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=junkio@cox$(echo .)net \
--cc=rob@codeweavers$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox