git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marco <netuse@lavabit.com>
To: git@vger.kernel.org
Subject: Swap file trouble with gvimdiff
Date: Thu, 24 Feb 2011 20:34:12 +0100	[thread overview]
Message-ID: <20110224203412.29b732b9@glyph> (raw)

Hi,

I use gvimdiff as difftool. The relevant .gitconfig entries look as follows:

[diff]
	tool = gvimdiff
[difftool]
	prompt = false

But when one diffs a file alredy opened in another window it clashes because
gvimdiff recognises the swap file and throws a message.

It would make sense to pass the option »-n« to gvimdiff to avoid creating a
swap file, since it is not needed here.

I haven't found the place where the command line and arguments for the
supported difftools are placed, so I created a new entry in the .gitconfig

[diff]
	tool = bettergvimdiff
[difftool "bettergvimdiff"]
	cmd = "gvimdiff -f -n \"$LOCAL\" \"$REMOTE\""

I want to know if this is a »correct« solution and — if not — how you solve
the problem.


Marco

             reply	other threads:[~2011-02-24 19:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24 19:34 Marco [this message]
2011-02-25  9:36 ` [PATCH] mergetool-lib: call vim in readonly mode for diffs Michael J Gruber
2011-02-25 20:01   ` Junio C Hamano
2011-02-27 22: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=20110224203412.29b732b9@glyph \
    --to=netuse@lavabit.com \
    --cc=git@vger.kernel.org \
    /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).