Re: [PATCH 1/4] sequencer: Warn when internal merge may be suboptimal due to renameLimit

2017-11-12 Thread Junio C Hamano
Elijah Newren <new...@gmail.com> writes: > Subject: Re: [PATCH 1/4] sequencer: Warn when internal merge may be > suboptimal due to renameLimit Style: please downcase s/Warn/warn/ to fit this better in "shortlog --no-merges" output. > Having renamed files silently tr

[PATCH 1/4] sequencer: Warn when internal merge may be suboptimal due to renameLimit

2017-11-10 Thread Elijah Newren
Having renamed files silently treated as deleted/modified conflicts instead of correctly resolving the renamed/modified case has caused lots of pain for some users. Eventually, some of them figured out to set merge.renameLimit to something higher, but without feedback about what value it should