From: Yaroslav Halchenko <debian@onerussian.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org, Elijah Newren <newren@gmail.com>
Subject: Re: problem with cherry-picking a commit which comes before introducing a new submodule
Date: Tue, 18 Jan 2011 11:02:22 -0500 [thread overview]
Message-ID: <20110118160222.GA23926@onerussian.com> (raw)
In-Reply-To: <20110111132710.GA14905@burratino>
On Tue, 11 Jan 2011, Jonathan Nieder wrote:
> ...
> a submodule might be another reason for a directory in the worktree.
> In any event, we get a spurious conflict.
> Thanks, that was interesting (no patch yet, alas).
is there a way to memorize this issue somewhere (bug tracking/TODO/etc)
where this issue could be recorded so it doesn't get forgotten? ;)
--
Yaroslav O. Halchenko
Postdoctoral Fellow, Department of Psychological and Brain Sciences
Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755
Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419
WWW: http://www.linkedin.com/in/yarik
next prev parent reply other threads:[~2011-01-18 16:02 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-07 17:24 problem with cherry-picking a commit which comes before introducing a new submodule Yaroslav Halchenko
2011-01-07 18:15 ` Jonathan Nieder
2011-01-07 18:32 ` Yaroslav Halchenko
2011-01-07 23:00 ` Jonathan Nieder
2011-01-07 23:48 ` Yaroslav Halchenko
2011-01-08 0:01 ` Yaroslav Halchenko
2011-01-11 13:27 ` Jonathan Nieder
2011-01-18 16:02 ` Yaroslav Halchenko [this message]
2011-01-18 16:08 ` Andreas Ericsson
2011-01-18 16:20 ` Yaroslav Halchenko
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=20110118160222.GA23926@onerussian.com \
--to=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=newren@gmail.com \
/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).