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

Re: Bug? I can't manually merge changes with difftool

From
JHJeff Hostetler <git@jeffhostetler.com>
Date
Feb 16, 2021, 18:54 UTC
Message-ID
<fd7ced2a-3b07-eb07-cb48-0a57dac9a5e0@jeffhostetler.com>
In-Reply-To
<b46fd946-42ad-2c33-0294-415949b9085e@narod.ru>
On 2/16/21 1:30 PM, Victor Porton wrote:
Show 12 quoted lines
> When I run
> 
> git difftool main HEAD
> 
> and manually merge changes in started meld or kdiff3 and then save the
> resulting file, it is saved somewhere in /tmp not in the workdir.
> Workdir is not modified after I close meld or kdiff3.
> 
> I need to store changes in workdir.
> 
> Is it a bug of Git 2.27.0.
>

When you give it two branches or refs, it does a "historical" diff between those two versions. If you omit "HEAD" from the command line, it will diff your "main" branch against the live version in your worktree.

Jeff
Previous: Victor Porton
Message 2 of 2 in “Bug? I can't manually merge changes with difftool”
  1. Victor PortonFeb 16, 2021
  2. Jeff HostetlerFeb 16, 2021

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.