* [PATCH] Documentation: improve description of "git reset --keep"
@ 2010-03-09 1:51 Christian Couder
2010-03-09 5:43 ` Peter Baumann
0 siblings, 1 reply; 2+ messages in thread
From: Christian Couder @ 2010-03-09 1:51 UTC (permalink / raw)
To: Junio C Hamano
Cc: git, Linus Torvalds, Johannes Schindelin, Stephan Beyer,
Daniel Barkalow, Jonathan Nieder, Peter Baumann
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::
--
1.7.0.1.307.g861f4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Documentation: improve description of "git reset --keep"
2010-03-09 1:51 [PATCH] Documentation: improve description of "git reset --keep" Christian Couder
@ 2010-03-09 5:43 ` Peter Baumann
0 siblings, 0 replies; 2+ messages in thread
From: Peter Baumann @ 2010-03-09 5:43 UTC (permalink / raw)
To: Christian Couder
Cc: Junio C Hamano, git, Linus Torvalds, Johannes Schindelin,
Stephan Beyer, Daniel Barkalow, Jonathan Nieder
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-09 12:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-09 1:51 [PATCH] Documentation: improve description of "git reset --keep" Christian Couder
2010-03-09 5:43 ` Peter Baumann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox