From: skillzero@gmail.com
To: git@vger.kernel.org
Subject: git merge and cherry-pick and duplicated commits?
Date: Tue, 13 Jan 2009 18:40:53 -0800 [thread overview]
Message-ID: <2729632a0901131840v5c7ce0c7l3f87c03caabf68de@mail.gmail.com> (raw)
I created a branch from master, did a commit (8e9fdd), then did 2 more
commits (11c59c and 7024d), then did another commit (2daf23). From
master, I did a commit (47bd1b) then cherry-pick'd 2 commits from the
branch (11c59c and 7024d). When merged the branch into master, I see
the 2 cherry-picked commits twice in the log (once from the original
cherry-pick's and again from the merge).
I thought git would realize that master already had those 2 commits
and not add them again when merging?
next reply other threads:[~2009-01-14 2:42 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-14 2:40 skillzero [this message]
2009-01-14 5:31 ` git merge and cherry-pick and duplicated commits? Brian Gernhardt
2009-01-14 6:21 ` skillzero
2009-01-14 7:34 ` Johannes Sixt
2009-01-14 8:08 ` skillzero
2009-01-14 8:34 ` Johannes Sixt
2009-01-14 18:33 ` skillzero
2009-01-14 19:40 ` Peter Baumann
2009-01-14 20:16 ` Junio C Hamano
2009-01-15 23:09 ` Markus Heidelberg
2009-01-14 8:38 ` Boaz Harrosh
2009-01-14 8:41 ` Thomas Rast
2009-01-14 13:47 ` Alex Riesen
2009-01-14 7:33 ` skillzero
2009-01-14 15:53 ` Sitaram Chamarty
2009-01-14 8:31 ` Nanako Shiraishi
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=2729632a0901131840v5c7ce0c7l3f87c03caabf68de@mail.gmail.com \
--to=skillzero@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 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).