From: James Pickens <jepicken@gmail.com>
To: David Aguilar <davvid@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: [PATCH 6/8 v2] sh-tools: add a run_merge_tool function
Date: Tue, 31 Mar 2009 11:15:52 -0700 [thread overview]
Message-ID: <885649360903311115o6131988emdcba6ef215ec0ab0@mail.gmail.com> (raw)
In-Reply-To: <1238400684-14881-1-git-send-email-davvid@gmail.com>
On Mon, Mar 30, 2009 at 1:11 AM, David Aguilar <davvid@gmail.com> wrote:
> This function launches merge tools and will be used to refactor
> git-(diff|merge)tool.
Thanks for writing difftool; I find it quite useful. I tried it with
tkdiff, and noticed that it shows the 'merge preview' window even though it
isn't doing a merge. If a user with unstaged changes were to carelessly
click the 'save and exit' button, his changes could be lost. So I think
it's a good idea to stop the merge preview window from showing up under
difftool. To do that I think you just have to remove the '-o "$MERGED"'
option to tkdiff.
James
next prev parent reply other threads:[~2009-03-31 18:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-30 8:11 [PATCH 6/8 v2] sh-tools: add a run_merge_tool function David Aguilar
2009-03-31 18:15 ` James Pickens [this message]
2009-03-31 22:11 ` Markus Heidelberg
2009-04-01 8:36 ` David Aguilar
2009-04-02 5:33 ` David Aguilar
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=885649360903311115o6131988emdcba6ef215ec0ab0@mail.gmail.com \
--to=jepicken@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).