From: Junio C Hamano <gitster@pobox.com>
To: Mike Shal <marfey@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: git show-branch --topics and merge commits
Date: Mon, 18 Jul 2011 11:14:34 -0700 [thread overview]
Message-ID: <7v4o2jlalx.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CA+6x0LXHKZgvW4_hWz8qrWQshqxB3pQ-=08itqnV5smA_NCrBA@mail.gmail.com> (Mike Shal's message of "Sun, 17 Jul 2011 23:37:47 -0400")
Mike Shal <marfey@gmail.com> writes:
> Ok, makes sense. Is 'git rev-list' supposed to give the same list of
> commits then? In my example, rev-list shows the commit on the branch
> even after upstream has been merged in.
"show-branch" was designed to stop after seeing a commit that are shared
with all the branches it was given, so
git show-branch A B
is more like
git rev-list --left-right --boundary A...B
and not at all like
git rev-list A..B
which is to show all commits not in A that appear in B.
Note that show-branch was invented way before the log family of commands
(which rev-list is a member of) learned --left-right/--boundary/--graph
options, and I personally think its graphical output mode outlived its
usefulness as a stopgap measure. As its "merge-base" and "independent"
modes have also been made redundant (see "git merge-base" for two options
to mimic their behaviour), we may want to start thinking about deprecating
the command, and the first step perhaps would be to replace its mention
from the first part of the Everyday Git document with something more
appropriate such as "git log".
next prev parent reply other threads:[~2011-07-18 18:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-17 23:56 git show-branch --topics and merge commits Mike Shal
2011-07-18 2:21 ` Junio C Hamano
2011-07-18 3:37 ` Mike Shal
2011-07-18 18:14 ` Junio C Hamano [this message]
2011-07-18 23:34 ` Mike Shal
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=7v4o2jlalx.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=marfey@gmail.com \
/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).