Elijah Newren <newren@xxxxxxxxx> writes: >> > Yup, I found that the messages on inner conflicts, especially when >> > they "cancel out" at the outer merge, are mostly noise that carries >> > very little useful information (by being noisy, the user gets a sense >> > of how complex the histories being merged are). Reducing the default >> > messaging level would probably be a good idea. >> >> Here is what I just had to scroll through to update 'next' by >> merging back 'master', only to grab the updates to the release >> notes. Needless to say, this would have been somewhat baffling >> if I didn't know to expect it. >> >> It would be good to squelch it before we hear another complaints >> from old-timer power users ;-) > > I'll submit a patch soon. > >> >> $ git merge -m 'Sync with master' --no-log master >> From inner merge: Auto-merging blame.c >> From inner merge: Auto-merging builtin/am.c >> From inner merge: Auto-merging builtin/blame.c >> From inner merge: Auto-merging builtin/clone.c >> From inner merge: Auto-merging builtin/clone.c >> From inner merge: Auto-merging builtin/commit.c >> From inner merge: Auto-merging builtin/fetch.c >> From inner merge: Auto-merging builtin/fetch.c >> From inner merge: Auto-merging builtin/grep.c >> From inner merge: Auto-merging builtin/hash-object.c >> From inner merge: Auto-merging builtin/log.c >> From inner merge: Auto-merging builtin/log.c >> From inner merge: Auto-merging builtin/pack-objects.c >> From inner merge: Auto-merging builtin/pull.c >> From inner merge: Auto-merging builtin/pull.c >> From inner merge: Auto-merging builtin/rebase.c >> From inner merge: Auto-merging builtin/rebase.c >> From inner merge: Auto-merging builtin/reflog.c >> From inner merge: CONFLICT (content): Merge conflict in builtin/reflog.c >> Auto-merging builtin/reflog.c Thanks. I think "From inner merge: " can be removed even when we emit these messages, as the indentation would make it clear that the indented ones are different from the outermost ones.
