Re: [PATCH] diff: make -M -C mean the same as -C -M

2015-01-23 Thread Junio C Hamano
Mike Hommey writes: >> In the context of "git blame", "-C" and "-M" control orthogonal >> concepts and it makes sense to use only one but not the other, or >> both. > > In the context of blame both -C and -M |= a flags set, so one doesn't > override the other. You can place them in any order, the

Re: [PATCH] diff: make -M -C mean the same as -C -M

2015-01-23 Thread Mike Hommey
On Fri, Jan 23, 2015 at 10:41:10AM -0800, Junio C Hamano wrote: > Mike Hommey writes: > > > While -C implies -M, it is quite common to see both on example command lines > > here and there. The unintuitive thing is that if -M appears after -C, then > > copy detection is turned off because of how t

Re: [PATCH] diff: make -M -C mean the same as -C -M

2015-01-23 Thread Junio C Hamano
Mike Hommey writes: > While -C implies -M, it is quite common to see both on example command lines > here and there. The unintuitive thing is that if -M appears after -C, then > copy detection is turned off because of how the command line arguments are > handled. This is deliberate, see below.

[PATCH] diff: make -M -C mean the same as -C -M

2015-01-22 Thread Mike Hommey
While -C implies -M, it is quite common to see both on example command lines here and there. The unintuitive thing is that if -M appears after -C, then copy detection is turned off because of how the command line arguments are handled. Change this so that when both -C and -M appear, whatever their