From: Junio C Hamano <gitster@pobox.com>
To: Jeremy Morton <admin@game-point.net>
Cc: git@vger.kernel.org
Subject: Re: Fixing the p4merge launch shell script
Date: Tue, 02 Oct 2012 17:44:45 -0700 [thread overview]
Message-ID: <7vipas5qpu.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <506B7AFB.1070700@game-point.net> (Jeremy Morton's message of "Wed, 03 Oct 2012 00:38:35 +0100")
Jeremy Morton <admin@game-point.net> writes:
> I've noticed that the p4merge shell script could do with some
> improvement when it comes to merging. Because p4merge throws up an
> error when one of the files it's given to diff is "/dev/null", git
> needs to create a temporary empty file and pass that to p4merge when
> diffing a file that has been created/deleted (eg. create file, git add
> ., git diff --cached).
> ...
> Thoughts? Is there an easier way to do this?
Which version of git? Perhaps you do not have ec245ba (mergetool:
Provide an empty file when needed, 2012-01-19) yet?
next prev parent reply other threads:[~2012-10-03 0:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-02 23:38 Fixing the p4merge launch shell script Jeremy Morton
2012-10-03 0:44 ` Junio C Hamano [this message]
2012-10-03 8:34 ` Jeremy Morton
2012-10-04 6:59 ` David Aguilar
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vipas5qpu.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=admin@game-point.net \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).