From: Junio C Hamano <gitster@pobox.com>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [BUG] Highly inconsistent diff UI
Date: Wed, 24 Apr 2013 14:23:59 -0700 [thread overview]
Message-ID: <7vvc7baahc.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: CALkWK0m5Q_e3q6Yg94-K+jU_SS7ovR2wnz-_Nr3cMz_YM=SMDQ@mail.gmail.com
Ramkumar Ramachandra <artagnon@gmail.com> writes:
> Sorry I wasn't clear. A~B = $(git merge-base A B) B to diff and $(git
> merge-base A B)..B to log.
>
> Basically, I want to be able to do git log master~rebase.autostash
> (without having to rebase).
How is it different from "git log master..rebase.autostash"?
git log A..B
is already a perfectly fine way to spell your "A~B", which is
git log B --not $(git merge-base --all A B)
when written in longhand [*1*], no?
So I do not think your A~B helps "log".
It does not help "diff" either, because we already have A...B and we
are not going to remove it (people are used to what it means).
So I think your A~B is still a solution that is looking for a
problem.
[Footnote]
*1* You need to understand what merge-base is in order to analyse
the equivalence of these two. A..B asks for those that are
reachable from B that are not reachable from A. What does the
other form ask, by saying "ones that can be reached from B but
exclude the ones that are reachable from any merge base of A and
B"?
On the history leading to A, there are two kinds of commits:
those that are not reachable from B and those that are. The
ones closer to A may not be reachable from B but if you dig the
history starting from A and keep finding ancestors, you will
eventually hit one that can be reached from B. Once you hit
such a commit, everything beyond that point are reachable from
both A and B. E.g.
---o---*---a---a---a---A
\
b---b---B
And we call that a merge base between A and B (e.g. '*'). Any
ancestor of a merge base, e.g. 'o', is reachable from A and is
excluded from "A..B".
next prev parent reply other threads:[~2013-04-24 21:24 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
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 [this message]
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=7vvc7baahc.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=artagnon@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).