On Wed, Nov 25, 2009 at 2:31 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Avery Pennarun <apenwarr@xxxxxxxxx> writes: >> I've read through the thread (I do remember skimming it awhile ago) >> but can't find patches for the syntax actually under discussion. > > I very much prefer gmane threading when following discussion over all the > other mail archives, but this shows one thing I really dislike about it. [...] > Look at http://github.com/gitster/git/commits/jc/merge-theirs/ I also tried simply searching for things like 'git "-xsubtree"' in google, with no luck. But thanks for the link. > and found this series in there. It applies to v1.6.0-rc0~245 (no, I won't > be rebasing this myself---I don't have time for that while preparing for > the pre-release feature freeze). I did a test merge and it looks like a ton of conflicts, but they seem to be pretty understandable ones, at least. I don't mind doing the rebase and resubmitting the patches, since it's sure less work than figuring out how to do it from scratch myself. Some questions though: - What was the reason this never got merged? What changes are needed to rectify that? - Considering the earlier discussion, do we want to leave out the actual -Xtheirs feature and just have -Xours and -Xsubtree? - If I rebase them and the changes turn out to be minimal, do they still need a signed-off-by Junio? (He obviously owns part of the copyright and has previously signed off, but he also won't have signed off the rebased patches verbatim, so I'm confused.) Thanks, Avery -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html