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

Re: [PATCH] git-gui: pass the branch name to git merge

From
Johannes Sixt <j6t@kdbg.org>
Date
Nov 23, 2016, 19:23 UTC
Message-ID
<5baaf25b-6f15-8002-97ea-97c5c6a4b4e4@kdbg.org>
In-Reply-To
<1dc28731-9000-c3bf-fbed-0cb17c230d8b@kdbg.org>
Am 22.11.2016 um 21:40 schrieb Johannes Sixt:
Show 5 quoted lines
> Am 22.11.2016 um 20:16 schrieb Junio C Hamano:
>> Can't this be handled on the "git merge FETCH_HEAD" codepath
>> instead?
>
> Absolutely. Any takers? ;)

I attempted to fix git merge FETCH_HEAD, but I do not see a trivial solution.

But on second thought, we have an excuse to pick my proposed git-gui change anyway: Without that change and a fix in git-merge only, there is still a regression for all users who use the latest git-gui but some git version between 2.5.0 and the fixed git-merge...

-- Hannes
Previous: Johannes SixtNext: Junio C Hamano
Message 4 of 6 in “git-gui: pass the branch name to git merge”
  1. git-gui: pass the branch name to git mergeJohannes Sixt, Nov 22, 2016
  2. Junio C HamanoNov 22, 2016
  3. Johannes SixtNov 22, 2016
  4. Johannes SixtNov 23, 2016
  5. Junio C HamanoNov 23, 2016
  6. Johannes SixtNov 23, 2016

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.