* Bug? I can't manually merge changes with difftool
@ 2021-02-16 18:30 Victor Porton
2021-02-16 18:54 ` Jeff Hostetler
0 siblings, 1 reply; 2+ messages in thread
From: Victor Porton @ 2021-02-16 18:30 UTC (permalink / raw)
To: git
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Bug? I can't manually merge changes with difftool
2021-02-16 18:30 Bug? I can't manually merge changes with difftool Victor Porton
@ 2021-02-16 18:54 ` Jeff Hostetler
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Hostetler @ 2021-02-16 18:54 UTC (permalink / raw)
To: Victor Porton, git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-16 18:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-16 18:30 Bug? I can't manually merge changes with difftool Victor Porton
2021-02-16 18:54 ` Jeff Hostetler
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).