From: Junio C Hamano <gitster@pobox.com>
To: Thomas Rast <trast@inf.ethz.ch>
Cc: <git@vger.kernel.org>, Michael Haggerty <mhagger@alum.mit.edu>,
Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Johan Herland <johan@herland.net>
Subject: Re: [ANN] git-tbdiff: topic branch diff
Date: Sat, 11 May 2013 12:01:07 -0700 [thread overview]
Message-ID: <7vsj1twdcc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <87ip2pfs19.fsf@linux-k42r.v.cablecom.net> (Thomas Rast's message of "Sat, 11 May 2013 17:35:46 +0200")
Thomas Rast <trast@inf.ethz.ch> writes:
> In this case the matching up is trivial, but you can see that it clearly
> shows the added Signoffs and edited parts of message and patch.
>
> Have fun, and let me know if it breaks!
Nice.
I need to do this kind of comparison quite often, when a rerolled
series is received. Since there is no reason to re_base_ the series
with with an updated one on a different fork-point, I tend to do:
$ git checkout master...tr/topic
$ git am -s3c ./+tr-topic-2.mbox
... inspect the differences between tr/topic and HEAD ...
$ git branch -f tr/topic
where the first step finds the bottom boundary of the previous
iteration and detaches the HEAD at the commit, the second step
applies the rerolled series and the topic branch is updated in
the final step.
The "inspect the differences" step can be helped if I can use this
tool to say
$ git tbdiff master..tr/topic master..HEAD
It would probably be trivial to extend the command line parser to
also accept
$ git tbdiff tr/topic...
but that is an icing on the cake.
prev parent reply other threads:[~2013-05-11 19:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-11 15:35 [ANN] git-tbdiff: topic branch diff Thomas Rast
2013-05-11 15:44 ` Thomas Rast
2013-05-11 19:01 ` Junio C Hamano [this message]
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=7vsj1twdcc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
--cc=jrnieder@gmail.com \
--cc=mhagger@alum.mit.edu \
--cc=peff@peff.net \
--cc=trast@inf.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).