From: Jeff King <peff@peff.net>
To: Andreas Schwab <schwab@linux-m68k.org>
Cc: "Krzysztof Mazur" <krzysiek@podlesie.net>,
"Bojan Petrović" <bojan85@gmail.com>,
git@vger.kernel.org
Subject: Re: Mistake in git-reset documentation
Date: Sun, 28 Oct 2012 09:46:35 -0400 [thread overview]
Message-ID: <20121028134635.GA25519@sigill.intra.peff.net> (raw)
In-Reply-To: <m2zk36hg0q.fsf@igel.home>
On Sun, Oct 28, 2012 at 02:39:49PM +0100, Andreas Schwab wrote:
> 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.
I know, but that is somewhat buried for somebody who is seeing that the
"--<mode>" bit is optional and wondering what it means to omit it.
-Peff
next prev parent reply other threads:[~2012-10-28 13:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-27 11:21 Mistake in git-reset documentation Bojan Petrović
2012-10-28 8:36 ` Krzysztof Mazur
2012-10-28 9:32 ` Bojan Petrović
2012-10-28 11:07 ` Jeff King
2012-10-28 13:39 ` Andreas Schwab
2012-10-28 13:46 ` Jeff King [this message]
2012-10-28 14:13 ` Krzysztof Mazur
2012-10-29 5:38 ` Jeff King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121028134635.GA25519@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=bojan85@gmail.com \
--cc=git@vger.kernel.org \
--cc=krzysiek@podlesie.net \
--cc=schwab@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).