Re: generating combined diff without an existing merge commit

2016-10-21 Thread Jacob Keller
On Fri, Oct 21, 2016 at 3:41 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> Turns out that somehow I must have messed up my command because "git >> diff " does indeed do exactly what I >> want. > > Thanks. I was wondering why it didn't work for you, as the feature > was done exactly to

Re: generating combined diff without an existing merge commit

2016-10-21 Thread Junio C Hamano
Jacob Keller writes: > Turns out that somehow I must have messed up my command because "git > diff " does indeed do exactly what I > want. Thanks. I was wondering why it didn't work for you, as the feature was done exactly to support that use case ;-)

Re: generating combined diff without an existing merge commit

2016-10-21 Thread Jacob Keller
On Fri, Oct 21, 2016 at 2:40 PM, Jacob Keller wrote: > Hi, > > I recently determined that I can produce an interdiff for a series > that handles rebasing nicely and shows the conflicts resolved when > rebasing plus any other changes. > > The basic idea is something like the following, assuming tha

generating combined diff without an existing merge commit

2016-10-21 Thread Jacob Keller
Hi, I recently determined that I can produce an interdiff for a series that handles rebasing nicely and shows the conflicts resolved when rebasing plus any other changes. The basic idea is something like the following, assuming that v1 is a tag that points to the first version, v2 is a tag that p