From: "Tajti Ákos" <akos.tajti@intland.com>
To: git@vger.kernel.org
Subject: git cherry doesn't list a merge commit
Date: Mon, 13 Feb 2012 16:17:10 +0100 [thread overview]
Message-ID: <4F392976.9070009@intland.com> (raw)
Dear List,
I have a question/misunderstanding about 'git cherry'. The scenario is
the following:
I have two repositories (two forks of the same parent repo): A and B. I
created a commit in A, then pulled B to A and finally made an other
commit in A. This resulted the following commits:
-----
commit f6afabb0a734843d5d122b612f0701d27b178e42
Author: akostajti <akos.tajti@intland.com>
Date: Mon Feb 13 15:59:51 2012 +0100
modified a
commit 4ec4d59f632b93456890db139125419d16a10807
Merge: a73e884 2a483e8
Author: akostajti <akos.tajti@intland.com>
Date: Mon Feb 13 15:59:34 2012 +0100
Merge branch 'master' of http://localhost:3180/git/first-60-project
commit a73e884d2dadf29898c2d6b665ed79d352422d26
Author: akostajti <akos.tajti@intland.com>
Date: Mon Feb 13 15:58:48 2012 +0100
hkl
-----
Now If I fetch B to A and run 'git cherry FETCH_HEAD master' I get only
two changeset ids:
+ a73e884d2dadf29898c2d6b665ed79d352422d26
+ f6afabb0a734843d5d122b612f0701d27b178e42
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"
In my understanding this means that the merge commit
(4ec4d59f632b93456890db139125419d16a10807) should be also listed by
cherry, because it doesn't exist in the upstream. Am I doing something
wrong? How can I ge git cherry work as I expect?
Thanks in advance,
Ákos Tajti
next reply other threads:[~2012-02-13 15:17 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 15:17 Tajti Ákos [this message]
2012-02-13 18:57 ` git cherry doesn't list a merge commit Junio C Hamano
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=4F392976.9070009@intland.com \
--to=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).