From: Bruno Haible <bruno@clisp.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts
Date: Sun, 30 Sep 2007 23:25:56 +0200 [thread overview]
Message-ID: <200709302325.56235.bruno@clisp.org> (raw)
In-Reply-To: <7vk5q7hqld.fsf@gitster.siamese.dyndns.org>
Junio C Hamano wrote:
> The script needs to decide how it wants to present an unmerged
> path; the information on each unmerged stages can be read from
> the output of "ls-files -u $thatpath".
Thanks for this info. This, and "git cat-file", did the trick.
Bruno
prev parent reply other threads:[~2007-09-30 21:26 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-30 19:17 GIT_EXTERNAL_DIFF invoked with undocumented calling convention after unstashing conflicts Bruno Haible
2007-09-30 19:59 ` Junio C Hamano
2007-09-30 21:25 ` Bruno Haible [this message]
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=200709302325.56235.bruno@clisp.org \
--to=bruno@clisp.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).