* Also seeing the "problem with cherry-picking a commit which comes before introducing a new submodule"
@ 2011-02-03 4:08 Joshua Jensen
0 siblings, 0 replies; only message in thread
From: Joshua Jensen @ 2011-02-03 4:08 UTC (permalink / raw)
To: git@vger.kernel.org
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-03 4:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-03 4:08 Also seeing the "problem with cherry-picking a commit which comes before introducing a new submodule" Joshua Jensen
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).