From: Jonathan Nieder <jrnieder@gmail.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@inf.ethz.ch>, Git List <git@vger.kernel.org>
Subject: Re: [BUG] Highly inconsistent diff UI
Date: Thu, 25 Apr 2013 16:21:45 -0700 [thread overview]
Message-ID: <20130425232145.GM29963@google.com> (raw)
In-Reply-To: <CALkWK0mMvUXnMDY87h3US0gRuM44ADEYXPh+JVP23Ja1=yz=VQ@mail.gmail.com>
Ramkumar Ramachandra wrote:
> I thought ^@ was invented for scripting, but can't imagine a usecase for ^!.
I use "git diff $commit^!" from time to time to get the diff between a
merge and its first parent.
For comparison, I haven't found ^@ or "git log $commit^!" useful. The
commit introducing the former says
| I needed it to do the multi-tree diff on Len's infamous 12-way
| Octopus; typing "diff --cc funmerge funmerge^1 funmerge^2 funmerge^3
| ..." was too painful.
which is spelled as "git show --cc funmerge" these days.
next prev parent reply other threads:[~2013-04-25 23:21 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-24 12:23 [BUG] Highly inconsistent diff UI Ramkumar Ramachandra
2013-04-24 16:40 ` Jonathan Nieder
2013-04-24 17:49 ` Junio C Hamano
2013-04-24 18:12 ` Ramkumar Ramachandra
2013-04-24 19:23 ` Jonathan Nieder
2013-04-24 20:02 ` Junio C Hamano
2013-04-24 20:14 ` Ramkumar Ramachandra
2013-04-24 16:44 ` [BUG] " Junio C Hamano
2013-04-24 16:51 ` Ramkumar Ramachandra
2013-04-24 18:11 ` Junio C Hamano
2013-04-24 18:48 ` Ramkumar Ramachandra
2013-04-24 19:00 ` Ramkumar Ramachandra
2013-04-24 19:24 ` Junio C Hamano
2013-04-24 19:29 ` Ramkumar Ramachandra
2013-04-24 21:27 ` Junio C Hamano
2013-04-24 22:06 ` Ramkumar Ramachandra
2013-04-24 20:44 ` Thomas Rast
2013-04-24 20:54 ` Ramkumar Ramachandra
2013-04-24 21:02 ` Jonathan Nieder
2013-04-24 21:10 ` Ramkumar Ramachandra
2013-04-25 7:32 ` Thomas Rast
2013-04-25 8:06 ` Ramkumar Ramachandra
2013-04-25 16:37 ` Junio C Hamano
2013-04-25 17:11 ` Ramkumar Ramachandra
2013-04-25 23:21 ` Jonathan Nieder [this message]
2013-04-25 23:39 ` Junio C Hamano
2013-04-26 12:34 ` Duy Nguyen
2013-04-24 21:25 ` Phil Hord
2013-04-24 21:23 ` Junio C Hamano
2013-04-24 22:44 ` Ramkumar Ramachandra
2013-04-24 23:17 ` Ramkumar Ramachandra
2013-04-25 5:59 ` Junio C Hamano
2013-04-25 7:51 ` Ramkumar Ramachandra
2013-04-25 9:30 ` Ramkumar Ramachandra
2013-04-26 10:47 ` Ramkumar Ramachandra
2013-04-26 11:35 ` Ramkumar Ramachandra
2013-04-29 16:32 ` Junio C Hamano
2013-04-29 18:21 ` Ramkumar Ramachandra
2013-04-29 18:43 ` Junio C Hamano
2013-04-29 19:03 ` Ramkumar Ramachandra
2013-04-29 19:17 ` Ramkumar Ramachandra
2013-04-29 19:56 ` Junio C Hamano
2013-04-29 21:12 ` Ramkumar Ramachandra
2013-04-29 18:32 ` John Keeping
2013-04-25 4:27 ` Ramkumar Ramachandra
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=20130425232145.GM29963@google.com \
--to=jrnieder@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=trast@inf.ethz.ch \
/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.