From: Peter Baumann <waste.manager@gmx.de>
To: Christian Couder <chriscool@tuxfamily.org>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Stephan Beyer <s-beyer@gmx.net>,
Daniel Barkalow <barkalow@iabervon.org>,
Jonathan Nieder <jrnieder@gmail.com>
Subject: Re: [PATCH] Documentation: reset: describe new "--keep" option
Date: Sat, 6 Mar 2010 09:10:34 +0100 [thread overview]
Message-ID: <20100306081034.GA4827@m62s10.vlinux.de> (raw)
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
next prev parent reply other threads:[~2010-03-06 8:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-05 20:25 [PATCH] Documentation: reset: describe new "--keep" option Christian Couder
2010-03-06 8:10 ` Peter Baumann [this message]
2010-03-06 19:26 ` Christian Couder
2010-03-08 8:31 ` Junio C Hamano
2010-03-08 11:31 ` Christian Couder
2010-03-07 5:52 ` Junio C Hamano
2010-03-07 20:38 ` Christian Couder
2010-03-08 8:47 ` Peter Baumann
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=20100306081034.GA4827@m62s10.vlinux.de \
--to=waste.manager@gmx.de \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=s-beyer@gmx.net \
--cc=torvalds@linux-foundation.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).