On Wed, 30 Dec 2009, Christian Couder wrote: > > Another reroll with the following changes: > - patches to add --keep option have been removed for now > - documentation patch has been moved before the core code changes > - commit messages have been improved > - tests have been much improved thanks to Junio's suggestions > > Christian Couder (3): > reset: improve mixed reset error message when in a bare repo > Documentation: reset: add some tables to describe the different > options > reset: add a few tests for "git reset --merge" > > Stephan Beyer (1): > reset: use "unpack_trees()" directly instead of "git read-tree" FWIW, Ack on this version of the whole series - I don't think there is anything controversial here, and I think avoiding the execve of read-tree for something we have a library function for is a good thing (and the change in behavior looks like a bug-fix to me). And the whole "--keep" discussion can be resurrected later ;) Linus -- 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