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

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

From
Dennis Kaarsemaker <dennis@kaarsemaker.net>
Date
Oct 29, 2015, 17:56 UTC
Message-ID
<1446141395.3199.2.camel@kaarsemaker.net>
In-Reply-To
<56325C58.1060007@kdbg.org>
On do, 2015-10-29 at 18:50 +0100, Johannes Sixt wrote:
Show 11 quoted lines
> 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?
git-gui/lib/merge.tcl, method _start
The command is constructed on lines 115-120 (master as of today,
 37023ba3)
-- 
Dennis Kaarsemaker
www.kaarsemaker.net
Previous: Johannes SixtNext: Johannes Sixt
Message 2 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.