2 messages, 2 authors, 2021-02-16 · open the first message on its own page
From: Victor Porton <hidden>
Date: 2021-02-16 18:39:16
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.
From: Jeff Hostetler <hidden>
Date: 2021-02-16 18:55:45
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