From: Nick <oinksocket@letterboxes.org>
To: unlisted-recipients:; (no To-header on input)
Cc: git@vger.kernel.org
Subject: Re: cherry-picking a commit clobbers a file which is a directory in the target commit
Date: Mon, 06 Sep 2010 10:50:00 +0100 [thread overview]
Message-ID: <4C84B948.9040907@letterboxes.org> (raw)
In-Reply-To: <4C7FCE27.7000500@letterboxes.org>
I've been Warnocked. Can anyone point me in the right direction?
next prev parent reply other threads:[~2010-09-06 9:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-02 16:17 cherry-picking a commit clobbers a file which is a directory in the target commit Nick
2010-09-06 9:50 ` Nick [this message]
2010-09-06 15:20 ` Elijah Newren
2010-09-06 20:47 ` [PATCH 0/3] Fix resolvable rename + D/F conflict testcases Elijah Newren
2010-09-06 20:49 ` Elijah Newren
2010-09-06 20:47 ` [PATCH 1/3] t3509: Add rename + D/F conflict testcases that recursive strategy fails Elijah Newren
2010-09-06 20:47 ` [PATCH 2/3] merge-recursive: Small code cleanup Elijah Newren
2010-09-06 21:25 ` Elijah Newren
2010-09-06 23:49 ` Junio C Hamano
2010-09-07 16:23 ` Schalk, Ken
2010-09-08 6:24 ` Elijah Newren
2010-09-09 20:23 ` Schalk, Ken
2010-10-21 19:43 ` Camille Moncelier
2010-09-06 20:47 ` [PATCH 3/3] merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir Elijah Newren
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=4C84B948.9040907@letterboxes.org \
--to=oinksocket@letterboxes.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.