Re: [PATCH] Fix rebase with file move when diff.renames = copies

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, July 21, 2010 at 2:54:18 PM, Junio C Hamano wrote:

> "David D. Kilzer" <ddkilzer@xxxxxxxxxx>  writes:
> 
> > The bug is that git rebase does not disable diff.renames  when it runs
> > format-patch internally to feed into "am -3".  The fix  is simply to
> > include a --no-renames argument to format-patch to override  any local
> > diff.renames setting.
> >
> > Fix by Junio C  Hamano.  Test case by David D. Kilzer.
> >
> > Signed-off-by: David  D. Kilzer <ddkilzer@xxxxxxxxxx>
> 
> Hmm, I  actully do not recall doing this patch, even though I think what it
> does  probably makes sense.


Yeah, it was a while ago (Nov 11, 2008):

<http://marc.info/?l=git&m=122636263923046&w=2>

Sorry for the delay, but the issue still affects me.  :)

Dave

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]