From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Robin Rosenberg <robin.rosenberg@dewire.com>,
git@vger.kernel.org, Charles Bailey <charles@hashpling.org>
Subject: Re: [PATCH] mergetool: add an option for writing to a temporary directory
Date: Tue, 14 Oct 2014 23:38:49 -0700 [thread overview]
Message-ID: <20141015063848.GC14751@gmail.com> (raw)
In-Reply-To: <xmqqk3433h8m.fsf@gitster.dls.corp.google.com>
On Mon, Oct 13, 2014 at 12:24:41PM -0700, Junio C Hamano wrote:
> David Aguilar <davvid@gmail.com> writes:
>
> > Teach mergetool to write files in a temporary directory when
> > 'mergetool.writeToTemp' is true.
> >
> > This is helpful for tools such as Eclipse which cannot cope with
> > multiple copies of the same file in the worktree.
>
> With this can we drop the "change the temporary file name" patch by
> Robin Rosenberg?
>
> http://thread.gmane.org/gmane.comp.version-control.git/255457/focus=255599
>
> Message-Id: <1408607240-11369-1-git-send-email-robin.rosenberg@dewire.com>
I would think so but I'm biased ;-)
--
David
next prev parent reply other threads:[~2014-10-15 6:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-11 17:04 [PATCH] mergetool: add an option for writing to a temporary directory David Aguilar
2014-10-13 19:18 ` Junio C Hamano
2014-10-13 19:24 ` Junio C Hamano
2014-10-15 6:38 ` David Aguilar [this message]
2014-10-15 19:30 ` Robin Rosenberg
2014-10-15 20:45 ` Junio C Hamano
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=20141015063848.GC14751@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=robin.rosenberg@dewire.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).