From: "Martin Langhoff" <martin.langhoff@gmail.com>
To: git <git@vger.kernel.org>
Subject: git-diff --cc broken in 1.4.0?
Date: Mon, 12 Jun 2006 16:32:45 +1200 [thread overview]
Message-ID: <46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com> (raw)
I was looking at some merges in gitk and lamenting the apparent loss
of the nice two-sided diff we get with -cc, and now duting a slightly
messy merge I did git-diff -cc only to get...
$ git-ls-files --unmerged
100644 f1d3843b2b2e42ba78adcf37da6440f0d321852e 1 local/version.php
100644 9352efa45cd25d9ad58df12b4ac241ac226a8ad4 2 local/version.php
100644 50da9b47903f6179f55a3f44290e7feaa08342f4 3 local/version.php
$ git-diff --cc
diff --cc local/version.php
index 9352efa,50da9b4..0000000
--- a/local/version.php
+++ b/local/version.php
cheers,
martin
next reply other threads:[~2006-06-12 4:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-06-12 4:32 Martin Langhoff [this message]
2006-06-14 20:32 ` git-diff --cc broken in 1.4.0? Junio C Hamano
2006-06-14 20:58 ` Martin Langhoff
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=46a038f90606112132jaf33a25x5794a19db2a06d8d@mail.gmail.com \
--to=martin.langhoff@gmail.com \
--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 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).