On Mon, Jan 18, 2010 at 1:30 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > >> [Stalled] >> >> * ap/merge-backend-opts (2008-07-18) 6 commits >> - Document that merge strategies can now take their own options >> - Extend merge-subtree tests to test -Xsubtree=dir. >> - Make "subtree" part more orthogonal to the rest of merge-recursive. >> - Teach git-pull to pass -X<option> to git-merge >> - git merge -X<option> >> - git-merge-file --ours, --theirs >> >> "git pull" patch needs sq-then-eval fix to protect it from $IFS >> but otherwise seemed good. > > Generally I hate to step in to fix up other's series, especially when I > know that the party responsible for issues is capable enough. As the > pre-release feature freeze gets closer, however, I sometimes find myself > doing so, and (I repeat) I hate it. Sorry about that. I asked at the time whether you thought I should submit a patch or whether you were planning to do it, and didn't get an answer. And then when you wrote the above, I was away on vacation. I see it's now been merged into master, but in case you care... it looks ok to me :) Have fun, 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