From: Peter Baumann Date: Sat, 06 Mar 2010 08:10:34 GMT Subject: Re: [PATCH] Documentation: reset: describe new "--keep" option Message-ID: <20100306081034.GA4827@m62s10.vlinux.de> In-Reply-To: <20100305202537.25469.73470.chriscool@tuxfamily.org> 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