From: Jeff King <peff@peff.net>
Date: Sun, 28 Oct 2012 11:07:15 GMT
Subject: Re: Mistake in git-reset documentation
Message-ID: <20121028110715.GB11434@sigill.intra.peff.net>
In-Reply-To: <20121028083610.GA26374@shrek.podlesie.net>

On Sun, Oct 28, 2012 at 09:36:10AM +0100, Krzysztof Mazur wrote:

> -- >8 --
> Subject: [PATCH] doc: git-reset: make "--<mode>" optional
> 
> The git-reset's "--<mode>" is an optional argument, however it was
> documented as required.
> 
> Signed-off-by: Krzysztof Mazur <krzysiek@podlesie.net>

I think this is sane, but...

>  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"?

-Peff