Avery Pennarun <apenwarr@xxxxxxxxx> writes: >> Probably you can save time by using what was already done >> >> http://thread.gmane.org/gmane.comp.version-control.git/76650/focus=89021 > > Hi Nanako, > > 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. It is not easy to find a near-by thread when looking at an old article, and you have to be willing to bisect the page number at the right hand side of the web UI. Often a patch series is posted as a separate thread after a discussion reaches conclusion or identifies an issue to solve, and the real patch series lives in a near-by thread. Very inconvenient. I don't know how Nana digs up older discussion; maybe she knows better ways. In my primary repository, I have an archive of mothballed branches kept with this alias: [alias] hold = "!sh -c 'git update-ref refs/hold/$1 refs/heads/$1 && git branch -D $1' -" 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). f7713ce Document that merge strategies can now take their own options 7eda236 Make "subtree" part more orthogonal to the rest of merge-recursive. e416d61 Teach git-pull to pass -X<option> to git-merge 09f7d22 Teach git-merge to pass -X<option> to the backend strategy module 904288c git-merge-recursive-{ours,theirs} e0aafb4 git-merge-file --ours, --theirs -d3e977b Merge branch 'maint' Look at http://github.com/gitster/git/commits/jc/merge-theirs/ -- 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