git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Git merge commit message issue

From
Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date
Jul 6, 2015, 16:33 UTC
Message-ID
<vpq8uats0tb.fsf@anie.imag.fr>
In-Reply-To
<CAArk4YPvO46H2HXkPyPxwirauKXYJ1qpi_GmYMh-T2xz5EdaBQ@mail.gmail.com>
[ Please, don't top-post on this list ]
Andrey Hsiao <andreyhsiao@gmail.com> writes:
Show 5 quoted lines
> 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/
Previous: Andrey Hsiao
Message 4 of 4 in “Git merge commit message issue”
  1. Andrey HsiaoJul 6, 2015
  2. Matthieu MoyJul 6, 2015
  3. Andrey HsiaoJul 6, 2015
  4. Matthieu MoyJul 6, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.