{"thread":{"id":"25892","subject":"[PATCH] git-reset.txt: (git reset): order options alphabetically","startedAt":"2010-12-01T18:09:30Z","lastAt":"2010-12-01T18:09:30Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156972","messageId":"1291226970-17779-1-git-send-email-jari.aalto@cante.net","threadId":"25892","inReplyTo":null,"subject":"[PATCH] git-reset.txt: (git reset): order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T18:09:30Z","receivedAt":"2010-12-01T18:09:30Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-reset.txt |   43 ++++++++++++++++++++++---------------------\n 1 files changed, 22 insertions(+), 21 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex fd72976..e89956f 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -49,21 +49,21 @@ linkgit:git-add[1]).\n \tmust be one of the following:\n +\n --\n---soft::\n-\tDoes not touch the index file nor the working tree at all (but\n-\tresets the head to <commit>, just like all modes do). This leaves\n-\tall your changed files \"Changes to be committed\", as 'git status'\n-\twould put it.\n-\n---mixed::\n-\tResets the index but not the working tree (i.e., 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 --hard::\n \tResets the index and working tree. Any changes to tracked files in the\n \tworking tree since <commit> are discarded.\n \n+--keep::\n+\tResets the index, updates files in the working tree that are\n+\tdifferent between <commit> and HEAD, but keeps those\n+\twhich are different between HEAD and the working tree (i.e.\n+\twhich have local changes).\n+\tIf a file that is different between <commit> and HEAD has local changes,\n+\treset is aborted.\n++\n+In other words, --keep does a 2-way merge between <commit> and HEAD followed by\n+'git reset --mixed <commit>'.\n+\n --merge::\n \tResets the index and updates the files in the working tree that are\n \tdifferent between <commit> and HEAD, but keeps those which are\n@@ -75,16 +75,17 @@ linkgit:git-add[1]).\n In other words, --merge does something like a 'git read-tree -u -m <commit>',\n but carries forward unmerged index entries.\n \n---keep::\n-\tResets the index, updates files in the working tree that are\n-\tdifferent between <commit> and HEAD, but keeps those\n-\twhich are different between HEAD and the working tree (i.e.\n-\twhich have local changes).\n-\tIf a file that is different between <commit> and HEAD has local changes,\n-\treset is aborted.\n-+\n-In other words, --keep does a 2-way merge between <commit> and HEAD followed by\n-'git reset --mixed <commit>'.\n+--mixed::\n+\tResets the index but not the working tree (i.e., 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+\tresets the head to <commit>, just like all modes do). This leaves\n+\tall your changed files \"Changes to be committed\", as 'git status'\n+\twould put it.\n+\n --\n \n If you want to undo a commit other than the latest on a branch,\n-- \n1.7.2.3\n"}]}