From: Jonathan Nieder <jrnieder@gmail.com>
To: Eric Raible <raible@nextest.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: RFH: is the current file available to a custom merge driver?
Date: Tue, 31 Aug 2010 13:57:08 -0500 [thread overview]
Message-ID: <20100831185708.GS2315@burratino> (raw)
In-Reply-To: <4C7D4F63.2060307@nextest.com>
Hi Eric,
Eric Raible wrote:
> In writing a custom merge driver to support $dayjob
> requirements I've failed to find a simple way of getting
> the current file name that the driver is supposed to
> be merging.
>
> I of course have the "ancestor", "ours", and "theirs"
> temporary files, but for Ui purposes I'd like to know
> the filename as well.
It's not available. You can try modifying ll-merge.c to
expose it if you have an idea about how that should work.
next prev parent reply other threads:[~2010-08-31 18:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-31 18:52 RFH: is the current file available to a custom merge driver? Eric Raible
2010-08-31 18:57 ` Jonathan Nieder [this message]
2010-08-31 19:07 ` Eric Raible
-- strict thread matches above, loose matches on Subject: below --
2010-08-26 22:13 Eric Raible
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=20100831185708.GS2315@burratino \
--to=jrnieder@gmail.com \
--cc=git@vger.kernel.org \
--cc=raible@nextest.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).