{"thread":{"id":"2618","subject":"[PATCH] git-reset.txt: Small fix + clarifications.","startedAt":"2005-11-20T21:42:11Z","lastAt":"2005-11-20T21:42:11Z","messageCount":1,"participants":["Andreas Ericsson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"12393","messageId":"20051120214211.09A595BF78@nox.op5.se","threadId":"2618","inReplyTo":null,"subject":"[PATCH] git-reset.txt: Small fix + clarifications.","fromName":"Andreas Ericsson","fromEmail":"exon@op5.se","sentAt":"2005-11-20T21:42:11Z","receivedAt":"2005-11-20T21:42:11Z","isPatch":true,"sender":{"key":"exon@op5.se","avatar":"https://gravatar.com/avatar/b948c4f759e868f8e721e545e37afe2cf89cfa8e2ee8b70a432f0d76aee39891?d=mp&s=160"},"body":"\nThis basically translates the man-page from 'git-developerish' to plain\nenglish, adding some almost-sample output from git-status so users can\nrecognize what will happen.\n\nAlso mention explicitly that --mixed updates the index, while --soft\ndoesn't. I understood the old text to mean \"--mixed is exactly like\n--soft, but verbose\".\n\nSigned-off-by: Andreas Ericsson <ae@op5.se>\n\n---\n\n Documentation/git-reset.txt |   19 +++++++++++++++----\n 1 files changed, 15 insertions(+), 4 deletions(-)\n\napplies-to: 0262dd41632580ee56288ad12fce71b6d260bf38\n615aa2e01117c5ec82df3a5ad2f0328c89acdde8\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 31ec207..6af3a4f 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -14,19 +14,30 @@ DESCRIPTION\n Sets the current head to the specified commit and optionally resets the\n index and working tree to match.\n \n+This command is useful if you notice some small error in a recent\n+commit (or set of commits) and want to redo that part without showing\n+the undo in the history.\n+\n+If you want to undo a commit other than the latest on a branch,\n+gitlink:git-revert[1] is your friend.\n+\n OPTIONS\n -------\n --mixed::\n-\tLike --soft but reports what has not been updated. This is the\n-\tdefault action.\n+\tResets the index but not the working tree (ie, the changed files\n+\tare preserved but not marked for commit) and reports what has not\n+\tbeen updated. This is the default action.\n \n --soft::\n \tDoes not touch the index file nor the working tree at all, but\n-\trequires them in a good order.\n+\trequires them to be in a good order. This leaves all your changed\n+\tfiles \"Updated but not checked in\", as gitlink:git-status[1] would\n+\tput it.\n \n --hard::\n \tMatches the working tree and index to that of the tree being\n-\tswitched to.\n+\tswitched to. Any changes to tracked files in the working tree\n+\tsince <commit-ish> are lost.\n \n <commit-ish>::\n \tCommit to make the current HEAD.\n---\n0.99.9.GIT\n"}]}