All of lore.kernel.org
 help / color / mirror / Atom feed
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: Mon, 29 Apr 2013 11:43:40 -0700	[thread overview]
Message-ID: <7vmwshi3dv.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CALkWK0npQwFnFNpEzT5mgh5HvGUKf=Jz7v4Mn62BDBzb+qjY_A@mail.gmail.com> (Ramkumar Ramachandra's message of "Mon, 29 Apr 2013 23:51:03 +0530")

Ramkumar Ramachandra <artagnon@gmail.com> writes:

>>> $ git log rebase.autostash ^$(git merge-base rebase.autostash master)
>>
>> Depending on which one of B or C is chosen it is either one of these:
>>
>>  - range "^B H" which lists "H G D C"
>>  - range "^C H" which lists "H G D B"
>>
>> neither of which is more useful than "H G D", as it shows irrelevant
>> "other merge base" you did not pick.
>
> Correction:
>
> Range "^B H" lists "H G D A..C" while range "^C H" lists "H G D A..B".

Now you confused me.  A is reachable from B (or C) and you
are saying "^B H" (or "^C H").  Why does either of it show A?

Wait.  What does "lists H G D A..C" even mean?  H, G and D I would
understand, but how does "log" ever "list" A..C???

Now you really confused me.

A is not listed (it is explicitly marked uninteresting by being on
the left side of double-dots).  So we see either "H G D C" or "H G D
B".  We see no A in either case, no?

> In reality, it shows A..B, which is what I want and what am claiming
> is "useful".

What does it mean "log" "In reality" shows A..B?  Didn't you just
say it either lists "H G D C" or "H G D B"?  Neither B nor C is what
you did since you forked?  Now, what did you do since you folked
(which is the question you are asking)?  You made commit D,
back-merged from upstream to record G, and then made another commit
H.  That "H G D", which is what you get from "log F..H", isn't it??

  reply	other threads:[~2013-04-29 18:43 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
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 [this message]
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=7vmwshi3dv.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 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.