Re: [ANN] git-tbdiff: topic branch diff
Thomas Rast 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [ANN] git-tbdiff: topic branch diff
Thomas Rast writes:
> Hi,
>
> Spawned by discussion here at git-merge, I created a script that diffs
> the state of branches.
>
> You can grab it from
>
> https://github.com/trast/tbdiff.git
>
> The usage is
>
> git tbdiff A..B C..D
BTW, I should've mentioned this here too (it's in the README shown on
github): it currently depends on the 'hungarian' module for the matching
algorithm, found here:
https://pypi.python.org/pypi/hungarian
It's easy to install, but in the interests of wider usability I'll
probably write the same in pure python eventually.
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
