From: Matthieu Moy Date: Mon, 06 Jul 2015 16:33:36 GMT Subject: Re: Git merge commit message issue Message-ID: In-Reply-To: [ Please, don't top-post on this list ] Andrey Hsiao writes: > It was a bit sad since we use scripts to do the merge, then we can > check the conflict list in the log message, and assign to separate > owners to resolve them. > > Would it be possible to make it as an config option? If a script is doing the merge, then I guess you can let your script add the entry in .git/MERGE_MSG (based on something like 'git ls-files -u' or 'git status --porcelain | grep ^U'). This way, your script would work with any version of Git. Having a config option to restore the old behavior would make sense to me at least. I guess it falls in the category "patches welcome". -- Matthieu Moy http://www-verimag.imag.fr/~moy/