On Fri, Mar 05, 2010 at 09:25:36PM +0100, Christian Couder wrote: > and give an example to show how it can be used. > > +--keep:: > + Resets the index to match the tree recorded by the named commit, > + but keep changes in the working tree. Aborts if the reset would > + change files that are already modified in the working tree. > + Huh? Keep changes (by not touching the worktree) and then aborting if we touch the worktree. Seems like a contradiction to me. -- Peter -- 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