From: Junio C Hamano <gitster@pobox.com>
To: "Tajti Ákos" <akos.tajti@intland.com>
Cc: git@vger.kernel.org
Subject: Re: git cherry doesn't list a merge commit
Date: Mon, 13 Feb 2012 10:57:17 -0800 [thread overview]
Message-ID: <7vaa4mfto2.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <4F392976.9070009@intland.com> ("Tajti Ákos"'s message of "Mon, 13 Feb 2012 16:17:10 +0100")
Tajti Ákos <akos.tajti@intland.com> writes:
> However, the manual of git cherry says:
> "*Every* commit that doesn’t exist in the <upstream> branch has its
> id (sha1) reported, prefixed by a symbol. The ones that have
> equivalent change already in the <upstream> branch are prefixed with a
> minus (-) sign"
The sole purpose of the command is to decide which commits in the existing
history to run "format-patch" on to feed the output to "am" to update the
other history, and it was clear for both readers and the author of the
documentation that a "commit" meant a "non-merge commit" in that context.
A patch to rephrase it to "every non-merge commit" for clarity may not be
useless, though.
prev parent reply other threads:[~2012-02-13 18:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 15:17 git cherry doesn't list a merge commit Tajti Ákos
2012-02-13 18:57 ` Junio C Hamano [this message]
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=7vaa4mfto2.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=akos.tajti@intland.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).