{"thread":{"id":"12136","subject":"[PATCH 2/2] Documentation: Add a usage case of git-reset with path","startedAt":"2008-02-16T16:48:45Z","lastAt":"2008-02-16T20:10:21Z","messageCount":6,"participants":["Pieter de Bie","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"68904","messageId":"1203180526-12020-1-git-send-email-pdebie@ai.rug.nl","threadId":"12136","inReplyTo":null,"subject":"[PATCH 1/2] Documentation: Remove deprecated --mixed option in git-reset synopsis","fromName":"Pieter de Bie","fromEmail":"pdebie@ai.rug.nl","sentAt":"2008-02-16T16:48:45Z","receivedAt":"2008-02-16T16:48:45Z","isPatch":true,"sender":{"key":"pdebie@ai.rug.nl","avatar":null},"body":"And while we're at it, use the dashless git call\n\nSigned-off-by: Pieter de Bie \n---\n Documentation/git-reset.txt | 4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex a4e0a77..2b24641 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -8,8 +8,8 @@ git-reset - Reset current HEAD to the specified state\n SYNOPSIS\n --------\n [verse]\n-'git-reset' [--mixed | --soft | --hard] [-q] []\n-'git-reset' [--mixed] [-q] [] [--] ...\n+'git reset' [--mixed | --soft | --hard] [-q] []\n+'git reset' [-q] [] [--] ...\n \n DESCRIPTION\n -----------\n-- \n1.5.4.3.gb183\n"},{"id":"68903","messageId":"1203180526-12020-2-git-send-email-pdebie@ai.rug.nl","threadId":"12136","inReplyTo":"1203180526-12020-1-git-send-email-pdebie@ai.rug.nl","subject":"[PATCH 2/2] Documentation: Add a usage case of git-reset with path","fromName":"Pieter de Bie","fromEmail":"pdebie@ai.rug.nl","sentAt":"2008-02-16T16:48:46Z","receivedAt":"2008-02-16T16:48:46Z","isPatch":true,"sender":{"key":"pdebie@ai.rug.nl","avatar":null},"body":"\nSigned-off-by: Pieter de Bie \n---\n Documentation/git-reset.txt | 17 +++++++++++++++++\n 1 files changed, 17 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 2b24641..39a9d64 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -176,6 +176,23 @@ $ git reset <3>\n committed as 'snapshot WIP'. This updates the index to show your\n WIP files as uncommitted.\n \n+Reset a single file in the index::\n++\n+Suppose you have added a file to your index, but later decide you do not\n+want to add it to your commit. You can remove the file from the index\n+while keeping your changes with git reset.\n++\n+------------\n+$ git reset -- frotz.c <1>\n+$ git commit -m \"Commit files in index\" <2>\n+$ git add frotz.c <3>\n+------------ \n++\n+<1> This removes the file from the index while keeping it in the working\n+ directory.\n+<2> This commits all other changes in the index.\n+<3> Adds the file to the index again.\n+\n Author\n ------\n Written by Junio C Hamano and Linus Torvalds \n-- \n1.5.4.3.gb183\n"},{"id":"68915","messageId":"7vabm0agob.fsf@gitster.siamese.dyndns.org","threadId":"12136","inReplyTo":"1203180526-12020-2-git-send-email-pdebie@ai.rug.nl","subject":"Re: [PATCH 2/2] Documentation: Add a usage case of git-reset with path","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-16T18:40:20Z","receivedAt":"2008-02-16T18:40:20Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pieter de Bie writes:\n\n> @@ -176,6 +176,23 @@ $ git reset <3>\n> committed as 'snapshot WIP'. This updates the index to show your\n> WIP files as uncommitted.\n> \n> +Reset a single file in the index::\n\nYeah, an example and description for this relatively new feature\nhas been lacking. Very mucuh appreciated.\n\nBy the way, I noticed a leftover from our ancient past.\n\n-- >8 --\n[PATCH] Documentation/git-reset:\n\nSince 3368d11 (Remove unnecessary git-rm --cached reference from\nstatus output), the status output marks the \"Added but not yet\ncommitted\" section as \"Changes to be committed\".\n\nSigned-off-by: Junio C Hamano \n---\n Documentation/git-reset.txt | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex a4e0a77..b6bcf4d 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -37,7 +37,7 @@ OPTIONS\n --soft::\n \tDoes not touch the index file nor the working tree at all, but\n \trequires them to be in a good order. This leaves all your changed\n-\tfiles \"Added but not yet committed\", as linkgit:git-status[1] would\n+\tfiles \"Changes to be committed\", as linkgit:git-status[1] would\n \tput it.\n \n --hard::\n-- \n1.5.4.1.1350.g2b9ee\n"},{"id":"68918","messageId":"7vir0o90hr.fsf@gitster.siamese.dyndns.org","threadId":"12136","inReplyTo":"1203180526-12020-1-git-send-email-pdebie@ai.rug.nl","subject":"Re: [PATCH 1/2] Documentation: Remove deprecated --mixed option in git-reset synopsis","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-16T19:15:12Z","receivedAt":"2008-02-16T19:15:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks, but the title should read \"redundant, unnecessary\", not\n\"deprecated\", I think.\n"},{"id":"68921","messageId":"7732B3AD-BF81-4BDD-9C9C-01A35185AE99@ai.rug.nl","threadId":"12136","inReplyTo":"7vir0o90hr.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH 1/2] Documentation: Remove deprecated --mixed option in git-reset synopsis","fromName":"Pieter de Bie","fromEmail":"pdebie@ai.rug.nl","sentAt":"2008-02-16T19:17:14Z","receivedAt":"2008-02-16T19:17:14Z","isPatch":true,"sender":{"key":"pdebie@ai.rug.nl","avatar":null},"body":"\nOn Feb 16, 2008, at 8:15 PM, Junio C Hamano wrote:\n\n> Thanks, but the title should read \"redundant, unnecessary\", not\n> \"deprecated\", I think.\n\nWell, if I run it:\n\n bash-3.2$ git reset --mixed -- NEWS\n warning: --mixed option is deprecated with paths.\n\nI included deprecated because it says so in the warning\n\n- Pieter\n"},{"id":"68931","messageId":"7vr6fc7jde.fsf@gitster.siamese.dyndns.org","threadId":"12136","inReplyTo":"7732B3AD-BF81-4BDD-9C9C-01A35185AE99@ai.rug.nl","subject":"Re: [PATCH 1/2] Documentation: Remove deprecated --mixed option in git-reset synopsis","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2008-02-16T20:10:21Z","receivedAt":"2008-02-16T20:10:21Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pieter de Bie writes:\n\n> Well, if I run it:\n>\n> bash-3.2$ git reset --mixed -- NEWS\n> warning: --mixed option is deprecated with paths.\n\nYeah, you are right.\n\nThe patch is on 'maint' (but it will be quite a while before I\ncan push it out).\n\nThanks.\n"}]}