From: Robin Rosenberg <robin.rosenberg.lists@dewire•com>
To: David Aguilar <davvid@gmail•com>
Cc: Junio C Hamano <gitster@pobox•com>,
git@vger•kernel.org, Charles Bailey <charles@hashpling•org>
Subject: Re: [PATCH] mergetool: add an option for writing to a temporary directory
Date: Wed, 15 Oct 2014 21:30:11 +0200 (CEST) [thread overview]
Message-ID: <293924028.621540.1413401411270.JavaMail.zimbra@dewire.com> (raw)
In-Reply-To: <20141015063848.GC14751@gmail.com>
----- Ursprungligt meddelande -----
> Från: "David Aguilar" <davvid@gmail•com>
> Till: "Junio C Hamano" <gitster@pobox•com>
> Kopia: "Robin Rosenberg" <robin.rosenberg@dewire•com>, git@vger•kernel.org, "Charles Bailey" <charles@hashpling•org>
> Skickat: onsdag, 15 okt 2014 8:38:49
> Ämne: Re: [PATCH] mergetool: add an option for writing to a temporary directory
>
> 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 ;-)
The new patch solves my problem.
-- robin
next prev parent reply other threads:[~2014-10-15 19:35 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
2014-10-15 19:30 ` Robin Rosenberg [this message]
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=293924028.621540.1413401411270.JavaMail.zimbra@dewire.com \
--to=robin.rosenberg.lists@dewire$(echo .)com \
--cc=charles@hashpling$(echo .)org \
--cc=davvid@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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