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: improve description of "git reset --keep"
Date: Tue, 9 Mar 2010 06:43:46 +0100 [thread overview]
Message-ID: <20100309054345.GC4827@m62s10.vlinux.de> (raw)
In-Reply-To: <20100309015117.10202.28588.chriscool@tuxfamily.org>
On Tue, Mar 09, 2010 at 02:51:16AM +0100, Christian Couder wrote:
> From: Junio C Hamano <gitster@pobox•com>
>
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
> ---
> Documentation/git-reset.txt | 9 ++++++---
> 1 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
> index 58d9b4c..645f0c1 100644
> --- a/Documentation/git-reset.txt
> +++ b/Documentation/git-reset.txt
> @@ -53,9 +53,12 @@ OPTIONS
> and the current commit in the working tree.
>
> --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.
> + Reset the index to the given commit, keeping local changes in
> + the working tree since the current commit, while updating
> + working tree files without local changes to what appears in
> + the given commit. If a file that is different between the
> + current commit and the given commit has local changes, reset
> + is aborted.
>
> -p::
> --patch::
Acked-by: Peter Baumann <waste.manager@gmx•de>
prev parent reply other threads:[~2010-03-09 12:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-09 1:51 [PATCH] Documentation: improve description of "git reset --keep" Christian Couder
2010-03-09 5:43 ` Peter Baumann [this message]
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=20100309054345.GC4827@m62s10.vlinux.de \
--to=waste.manager@gmx$(echo .)de \
--cc=Johannes.Schindelin@gmx$(echo .)de \
--cc=barkalow@iabervon$(echo .)org \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=jrnieder@gmail$(echo .)com \
--cc=s-beyer@gmx$(echo .)net \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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