From: Junio C Hamano <gitster@pobox.com>
To: "Gondek\, Andreas" <Andreas.Gondek@dwpbank.de>
Cc: "git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: AW: Getting the full path of a conflicting file within a custom merge driver?
Date: Tue, 02 Jun 2015 10:47:35 -0700 [thread overview]
Message-ID: <xmqq4mmq3sug.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <D8780C527EB1E642B3150E6D705B46D468837AA7@DWPWHMS531.dwpbank.local> (Andreas Gondek's message of "Tue, 2 Jun 2015 10:57:29 +0000")
"Gondek, Andreas" <Andreas.Gondek@dwpbank.de> writes:
> thank you for responding this fast. I would suggest providing this
> information as an additional parameter (like %A %O %B and %L) maybe
> %P.
Yes, per-cent plus a letter is more in line with the way information
is passed to the scripts already. Thanks for making a more sensible
counter-suggestion. And your %P(ath) sounds like a sensible choice.
It won't be a two-liner, though, as the path is an arbitrary string,
unlike the names of the three temporary files, and needs to be
quoted for the shell.
Let me see if I can find time today to cook up something.
next prev parent reply other threads:[~2015-06-02 17:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 15:46 Getting the full path of a conflicting file within a custom merge driver? Gondek, Andreas
2015-06-01 16:46 ` Junio C Hamano
2015-06-02 10:57 ` AW: " Gondek, Andreas
2015-06-02 17:47 ` Junio C Hamano [this message]
2015-06-04 22:11 ` Re*: " Junio C Hamano
2015-06-05 5:56 ` AW: " Gondek, Andreas
2015-06-05 8:07 ` Christian Couder
2015-06-05 8:38 ` Christian Couder
2015-06-05 15:19 ` AW: " 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=xmqq4mmq3sug.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Andreas.Gondek@dwpbank.de \
--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 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.