git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] Documentation: improve description of "git reset --keep"

From
PBPeter Baumann <waste.manager@gmx.de>
Date
Mar 9, 2010, 05:43 UTC
Message-ID
<20100309054345.GC4827@m62s10.vlinux.de>
In-Reply-To
<20100309015117.10202.28588.chriscool@tuxfamily.org>
On Tue, Mar 09, 2010 at 02:51:16AM +0100, Christian Couder wrote:
Show 28 quoted lines
> 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>
Previous: Christian Couder
Message 2 of 2 in “Documentation: improve description of "git reset --keep"”
  1. Documentation: improve description of "git reset --keep"Christian Couder, Mar 9, 2010
  2. Peter BaumannMar 9, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.