Elijah Newren <newren@xxxxxxxxx> writes: > I'm really embarrased about this one... :-/ Let's embarrass you even more ;-) After 5a2580d, the merge has become very noisy, and I don't see a good reason for that change. With a version of git built from 5a2580d^, for example, merging sp/fix-smart-http-deadlock-on-error into maint would give me this: ---------------- $ git merge sp/fix-smart-http-deadlock-on-error Auto-merging remote-curl.c Merge made by recursive. remote-curl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------- With 5a2580d, it has become this: ---------------- $ git merge sp/fix-smart-http-deadlock-on-error Adding builtin/add.c Auto-merging remote-curl.c Merge made by recursive. remote-curl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------- And with this patch on top, it will make it a disaster: ---------------- $ git merge sp/fix-smart-http-deadlock-on-error Adding builtin/add.c ... similar 97 Adding lines omitted ... Adding gitweb/static/gitweb.js Auto-merging remote-curl.c Adding t/lib-t6000.sh Adding t/t7810-grep.sh Adding t/t9350-fast-export.sh Merge made by recursive. remote-curl.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------- -- 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