From: Andreas Schwab <schwab@linux-m68k.org>
Date: Sun, 28 Oct 2012 13:39:49 GMT
Subject: Re: Mistake in git-reset documentation
Message-ID: <m2zk36hg0q.fsf@igel.home>
In-Reply-To: <20121028110715.GB11434@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

> On Sun, Oct 28, 2012 at 09:36:10AM +0100, Krzysztof Mazur wrote:
>
>>  DESCRIPTION
>>  -----------
>> @@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.
>>  you can use it to selectively reset hunks. See the ``Interactive Mode''
>>  section of linkgit:git-add[1] to learn how to operate the `--patch` mode.
>>  
>> -'git reset' --<mode> [<commit>]::
>> +'git reset' [--<mode>] [<commit>]::
>>  	This form resets the current branch head to <commit> and
>>  	possibly updates the index (resetting it to the tree of <commit>) and
>>  	the working tree depending on <mode>, which
>
> Should we say something like "if --<mode> is omitted, defaults to
> "--mixed"?

Under --mixed it already says "This is the default action", though.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."