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

git-gui is still using old-style git-merge invocation

From
Johannes Sixt <j6t@kdbg.org>
Date
Oct 29, 2015, 17:50 UTC
Message-ID
<56325C58.1060007@kdbg.org>

Performing a merge with git gui presents the following message in the merge result window:

warning: old-style 'git merge <msg> HEAD <commit>' is deprecated.
Merge made by the 'recursive' strategy.
  a | 1 +
  1 file changed, 1 insertion(+)
  create mode 100644 a
But I am unable to find where the invocation happens. Can somebody help?
-- Hannes
PS: Reproducer:

git init echo a > a git add a git commit -ma a git checkout -b side @~ echo b > b git add b git commit -mb git gui # to merge: Ctrl-M, Enter, Enter

Next: Dennis Kaarsemaker
Message 1 of 3 in “git-gui is still using old-style git-merge invocation”
  1. Johannes SixtOct 29, 2015
  2. Dennis KaarsemakerOct 29, 2015
  3. Johannes SixtOct 29, 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.