From: Jeff Hostetler <git@jeffhostetler.com>
To: Victor Porton <porton@narod.ru>, git@vger.kernel.org
Subject: Re: Bug? I can't manually merge changes with difftool
Date: Tue, 16 Feb 2021 13:54:28 -0500 [thread overview]
Message-ID: <fd7ced2a-3b07-eb07-cb48-0a57dac9a5e0@jeffhostetler.com> (raw)
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
prev parent reply other threads:[~2021-02-16 18:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-16 18:30 Bug? I can't manually merge changes with difftool Victor Porton
2021-02-16 18:54 ` Jeff Hostetler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fd7ced2a-3b07-eb07-cb48-0a57dac9a5e0@jeffhostetler.com \
--to=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=porton@narod.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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 NNTP newsgroup(s).