All of lore.kernel.org
 help / color / mirror / Atom feed
From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Michael J Gruber <git@drmicha.warpmail.net>,
	git@vger.kernel.org, netuse@lavabit.com
Subject: Re: [PATCH] mergetool-lib: call vim in readonly mode for diffs
Date: Sun, 27 Feb 2011 14:33:54 -0800	[thread overview]
Message-ID: <20110227223350.GA37866@gmail.com> (raw)
In-Reply-To: <7v62s7anp0.fsf@alter.siamese.dyndns.org>

On Fri, Feb 25, 2011 at 12:01:15PM -0800, Junio C Hamano wrote:
> Michael J Gruber <git@drmicha.warpmail.net> writes:
> 
> > When [g]vimdiff is called for files which are opened already, the editor
> > complains about the existing swap file. But we do not want to write
> > anything when called from difftool. So, make difftool use "-R" for the
> > vim family.
> 
> Makes sense.  Maint-worthy?

I think this would be good in maint.
thanks,
-- 
		David

      reply	other threads:[~2011-02-27 22:34 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-24 19:34 Swap file trouble with gvimdiff Marco
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 [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=20110227223350.GA37866@gmail.com \
    --to=davvid@gmail.com \
    --cc=git@drmicha.warpmail.net \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=netuse@lavabit.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.