From: Jeff Hostetler <git@jeffhostetler.com>
Date: Tue, 16 Feb 2021 18:54:28 GMT
Subject: Re: Bug? I can't manually merge changes with difftool
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:
> 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