From: Charles Bailey <charles@hashpling.org>
To: Evgeny <evgeny.zislis@gmail.com>
Cc: David Aguilar <davvid@gmail.com>, tytso@mit.edu, git@vger.kernel.org
Subject: Re: [PATCH] mergetool: export variables for use by custom mergetools
Date: Sun, 18 May 2008 01:07:39 +0100 [thread overview]
Message-ID: <20080518000739.GA29689@hashpling.org> (raw)
In-Reply-To: <b6840c770805171655y691fbd0vd2d65d0914757b63@mail.gmail.com>
On Sun, May 18, 2008 at 02:55:10AM +0300, Evgeny wrote:
> Ohh, so the documentation is not clear then.
That's a pity, I did make an effort with the documentation, but
explaining things is not my strongest ability.
>
> [mergetool "p4merge"]
> cmd = p4merge.sh "$PWD/$BASE" "$PWD/$REMOTE" "$PWD/$LOCAL" "$PWD/$MERGED"
> keepBackup = false
>
> [merge]
> tool = p4merge
>
"$PWD/" looks very wrong. Perhaps p4merge.sh is changing its working
directory and not handling the passed paths correctly?
> Thanks for the explanation!
> I believe that an example in the documentation could be a nice
> addition, to clear things up in the future.
Yes, there were a few examples in the original patch mail text (note
that 'path' has sinces changed to 'MERGED'), but they never made it to
the documentation. There's also some discussion about eval vs. leaking
environment variables:
http://thread.gmane.org/gmane.comp.version-control.git/74059
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2008-05-18 0:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-17 20:39 [PATCH] mergetool: export variables for use by custom mergetools David Aguilar
2008-05-17 23:34 ` Charles Bailey
2008-05-17 23:55 ` Evgeny
2008-05-18 0:07 ` Charles Bailey [this message]
2008-05-18 0:12 ` Evgeny
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=20080518000739.GA29689@hashpling.org \
--to=charles@hashpling.org \
--cc=davvid@gmail.com \
--cc=evgeny.zislis@gmail.com \
--cc=git@vger.kernel.org \
--cc=tytso@mit.edu \
/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).