{"thread":{"id":"29003","subject":"[PATCH] builtin-reset: Documentation update","startedAt":"2011-11-23T06:44:16Z","lastAt":"2011-11-23T06:44:16Z","messageCount":1,"participants":["vfr@lyx.org"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"179860","messageId":"1322030656-18683-1-git-send-email-vfr@lyx.org","threadId":"29003","inReplyTo":null,"subject":"[PATCH] builtin-reset: Documentation update","fromName":"","fromEmail":"vfr@lyx.org","sentAt":"2011-11-23T06:44:16Z","receivedAt":"2011-11-23T06:44:16Z","isPatch":true,"sender":{"key":"vfr@lyx.org","avatar":"https://avatars.githubusercontent.com/u/687868?v=4"},"body":"From: Vincent van Ravesteijn <vfr@lyx.org>\n\nThe second mode of 'git reset' is defined by the --patch\noption, while the third mode is defined by the <mode> option.\nHence, these options are mandatory in the description of the\nindividual modes.\n\nSigned-off-by: Vincent van Ravesteijn <vfr@lyx.org>\n---\n Documentation/git-reset.txt |    8 ++++----\n 1 files changed, 4 insertions(+), 4 deletions(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex b2832fc..b674866 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -9,8 +9,8 @@ SYNOPSIS\n --------\n [verse]\n 'git reset' [-q] [<commit>] [--] <paths>...\n-'git reset' [--patch|-p] [<commit>] [--] [<paths>...]\n-'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>]\n+'git reset' (--patch | -p) [<commit>] [--] [<paths>...]\n+'git reset' (--soft | --mixed | --hard | --merge | --keep) [-q] [<commit>]\n \n DESCRIPTION\n -----------\n@@ -34,7 +34,7 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you\n can copy the contents of a path out of a commit to the index and to the\n working tree in one go.\n \n-'git reset' --patch|-p [<commit>] [--] [<paths>...]::\n+'git reset' (--patch | -p) [<commit>] [--] [<paths>...]::\n \tInteractively select hunks in the difference between the index\n \tand <commit> (defaults to HEAD).  The chosen hunks are applied\n \tin reverse to the index.\n@@ -43,7 +43,7 @@ This means that `git reset -p` is the opposite of `git add -p`, i.e.\n you can use it to selectively reset hunks. See the ``Interactive Mode''\n section of linkgit:git-add[1] to learn how to operate the `\\--patch` mode.\n \n-'git reset' [--<mode>] [<commit>]::\n+'git reset' --<mode> [<commit>]::\n \tThis form resets the current branch head to <commit> and\n \tpossibly updates the index (resetting it to the tree of <commit>) and\n \tthe working tree depending on <mode>, which\n-- \n1.7.8-rc3\n"}]}