{"thread":{"id":"22960","subject":"Re: [PATCH] Documentation: improve description of \"git reset --keep\"","startedAt":"2010-03-09T01:51:16Z","lastAt":"2010-03-09T05:43:46Z","messageCount":2,"participants":["Peter Baumann","Christian Couder"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"136441","messageId":"20100309015117.10202.28588.chriscool@tuxfamily.org","threadId":"22960","inReplyTo":null,"subject":"[PATCH] Documentation: improve description of \"git reset --keep\"","fromName":"Christian Couder","fromEmail":"chriscool@tuxfamily.org","sentAt":"2010-03-09T01:51:16Z","receivedAt":"2010-03-09T01:51:16Z","isPatch":true,"sender":{"key":"christian.couder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/208954?v=4"},"body":"From: Junio C Hamano <gitster@pobox.com>\n\n\nSigned-off-by: Christian Couder <chriscool@tuxfamily.org>\n---\n Documentation/git-reset.txt |    9 ++++++---\n 1 files changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 58d9b4c..645f0c1 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -53,9 +53,12 @@ OPTIONS\n \tand the current commit in the working tree.\n \n --keep::\n-\tResets the index to match the tree recorded by the named commit,\n-\tbut keep changes in the working tree. Aborts if the reset would\n-\tchange files that are already modified in the working tree.\n+\tReset the index to the given commit, keeping local changes in\n+\tthe working tree since the current commit, while updating\n+\tworking tree files without local changes to what appears in\n+\tthe given commit.  If a file that is different between the\n+\tcurrent commit and the given commit has local changes, reset\n+\tis aborted.\n \n -p::\n --patch::\n-- \n1.7.0.1.307.g861f4\n"},{"id":"136434","messageId":"20100309054345.GC4827@m62s10.vlinux.de","threadId":"22960","inReplyTo":"20100309015117.10202.28588.chriscool@tuxfamily.org","subject":"Re: [PATCH] Documentation: improve description of \"git reset --keep\"","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2010-03-09T05:43:46Z","receivedAt":"2010-03-09T05:43:46Z","isPatch":true,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Tue, Mar 09, 2010 at 02:51:16AM +0100, Christian Couder wrote:\n> From: Junio C Hamano <gitster@pobox.com>\n> \n> \n> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>\n> ---\n>  Documentation/git-reset.txt |    9 ++++++---\n>  1 files changed, 6 insertions(+), 3 deletions(-)\n> \n> diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\n> index 58d9b4c..645f0c1 100644\n> --- a/Documentation/git-reset.txt\n> +++ b/Documentation/git-reset.txt\n> @@ -53,9 +53,12 @@ OPTIONS\n>  \tand the current commit in the working tree.\n>  \n>  --keep::\n> -\tResets the index to match the tree recorded by the named commit,\n> -\tbut keep changes in the working tree. Aborts if the reset would\n> -\tchange files that are already modified in the working tree.\n> +\tReset the index to the given commit, keeping local changes in\n> +\tthe working tree since the current commit, while updating\n> +\tworking tree files without local changes to what appears in\n> +\tthe given commit.  If a file that is different between the\n> +\tcurrent commit and the given commit has local changes, reset\n> +\tis aborted.\n>  \n>  -p::\n>  --patch::\n\nAcked-by: Peter Baumann <waste.manager@gmx.de>\n"}]}