Re: [PATCH v3 00/25] object_id part 10

"brian m. carlson" [off-list ref] writes:

On Mon, Oct 16, 2017 at 11:15:34AM +0900, Junio C Hamano wrote:

quoted

With a hope that this might help other reviewers, here is the
interdiff between "the previous one merged with v2.15-rc1" and "this
round applied on v2.15-rc1 directly".  

The changes all looked sensible to me.  Thanks.

Is there a reasonably straightforward tool or workflow to generate
interdiffs?  If so, I can include them in the future.

To me, it was straightforward to do:

    $ git checkout master^0
    $ git merge bc/object-id
    ... free conflict resolution thanks to rerere ...
    $ git commit -a -m 'old one'
    $ OLD=$(git describe)
    $ git checkout master^0
    $ git am bc-object-id.mbox
    $ git diff $OLD

If you had a copy of my 'pu' branch, then you would have had a merge
commit that merges your previous version of the topic to it, and you
can feed that to contrib/rerere-train.sh to tell your rerere database
how I resolved the conflicts there, which may apply to the reproduction
of the above procedure yourself.