From: "Ruud Huynen" <ruud.huynen@hispeed.ch>
To: <git@vger.kernel.org>
Subject: GIT: cherry-picking includes changes from a different commit
Date: Fri, 5 Dec 2014 21:04:28 +0100 [thread overview]
Message-ID: <02f801d010c6$ad32a1d0$0797e570$@hispeed.ch> (raw)
I noticed when cherry-picking a commit it includes changes from this commit
and also changes from a different commit as the one I was picking.
I was in contact with "jast" on IRC, who noticed the issue, but didn't had
time to look further.
For a description of my problem, please read
http://stackoverflow.com/questions/27220638/git-cherry-pick-info-about-picke
d-commits
git clone git://github.com/MythTV/mythtv.git
git checkout fixes/0.27
git cherry-pick 30df98ce5d11b69d0b5c5114a9007cdfc79a7e9b
# from master
# commit also picked: 17f17e1fc51b3b4017e08f5ea35c8a7b5a64eeec
# resulting in a conflict
For the commits and before/conflict files, see
https://gist.github.com/FritzHerbers/4f9b0990b6bca15a70eb
As nobody could believe me, that changes from another commit are included,
is something wrong, or is it new behavior? Why did it happen?
With which command, can I have a listing of "intermediate" commits picked?
How can I automate such situations?
Fritz
git version 1.9.1
next reply other threads:[~2014-12-05 20:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-05 20:04 Ruud Huynen [this message]
2014-12-06 3:17 ` GIT: cherry-picking includes changes from a different commit Keith Amling
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='02f801d010c6$ad32a1d0$0797e570$@hispeed.ch' \
--to=ruud.huynen@hispeed.ch \
--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).