Re: [PATCH v5 0/3] diff: Add diff.orderfile configuration variable

2013-12-18 Thread Junio C Hamano
Looks good; will replace and merge to 'next', but not today (I am already deep into today's integration cycle). Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-i

[PATCH v5 0/3] diff: Add diff.orderfile configuration variable

2013-12-18 Thread Samuel Bronson
I expect you've figured out what this patch series is about by now. In this version, I've applied Junio's suggestions from the last version, and also the stuff from the FIXUP commit he made after my stuff in the branch he merged into 'pu'. Samuel Bronson (3): diff: Tests for "git diff -O" diff