From: Joshua Jensen <jjensen@workspacewhiz.com>
To: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Also seeing the "problem with cherry-picking a commit which comes before introducing a new submodule"
Date: Wed, 02 Feb 2011 21:08:37 -0700 [thread overview]
Message-ID: <4D4A2A45.3060804@workspacewhiz.com> (raw)
Described in this thread, http://lists.zerezo.com/git/msg737184.html,
and this thread, http://lists.zerezo.com/git/msg705275.html, is a
problem similar to what I've been seeing today. It seems I can resolve
the "conflicting" submodule(s) and continue on, but it is a bit painful
as there are a small number of them. I also tried an interactive rebase
and assigning a 'pick' entry with the commit I'd like to cherry-pick,
and the same problem manifests.
In any case, it seems Jonathan Nieder has potentially identified the
problem at http://lists.zerezo.com/git/msg737401.html.
Has a patch come through that addresses this? If one did, did it make
it into 1.7.4?
Thanks!
Josh
reply other threads:[~2011-02-03 4:08 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4D4A2A45.3060804@workspacewhiz.com \
--to=jjensen@workspacewhiz.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).