Re: [PATCH v5 0/3] merge-recursive: option to disable renames

2016-02-21 Thread Felipe Gonçalves Assis
On 21 February 2016 at 04:40, Junio C Hamano wrote: > Yikes, your previous round is already in 'next', so could you make > this series an incremental on top of what is already queued up to > 1b47ad16 (merge-recursive: more consistent interface, 2016-02-17)? > > Thanks. > Oh,

Re: [PATCH v5 0/3] merge-recursive: option to disable renames

2016-02-21 Thread Junio C Hamano
Yikes, your previous round is already in 'next', so could you make this series an incremental on top of what is already queued up to 1b47ad16 (merge-recursive: more consistent interface, 2016-02-17)? Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

[PATCH v5 0/3] merge-recursive: option to disable renames

2016-02-20 Thread Felipe Gonçalves Assis
Add tests as suggested by Eric Sunshine. Also fixes an inconsitency in the last part. Since there were no tests for the --rename-threshold option, I added them in a separate commit, which is useful in itself. The other two commits contain the previous patches plus the relevant tests. For the