{"thread":{"id":"46177","subject":"[PATCH] doc: git-reset: clarify the --keep usage example","startedAt":"2017-06-14T09:45:07Z","lastAt":"2017-06-14T09:45:07Z","messageCount":1,"participants":["Štěpán Němec"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"322213","messageId":"1497432955-28525-1-git-send-email-stepnem@gmail.com","threadId":"46177","inReplyTo":null,"subject":"[PATCH] doc: git-reset: clarify the --keep usage example","fromName":"Štěpán Němec","fromEmail":"stepnem@gmail.com","sentAt":"2017-06-14T09:35:55Z","receivedAt":"2017-06-14T09:45:07Z","isPatch":true,"sender":{"key":"stepnem@gmail.com","avatar":"https://avatars.githubusercontent.com/u/106838?v=4"},"body":"The example doesn't work as provided (you get an error) when the 'edit'\nand 'commit' steps affect the same files.\nAdd a note and reference the DISCUSSION to that effect.\n\nSigned-off-by: Štěpán Němec <stepnem@gmail.com>\n---\n Documentation/git-reset.txt | 3 ++-\n 1 file changed, 2 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt\nindex 70f3753..727ba46 100644\n--- a/Documentation/git-reset.txt\n+++ b/Documentation/git-reset.txt\n@@ -290,7 +290,8 @@ $ git reset --keep start                    <3>\n     to branch2 (i.e. \"git checkout -b branch2 start\"), but nobody is\n     perfect.\n <3> But you can use \"reset --keep\" to remove the unwanted commit after\n-    you switched to \"branch2\".\n+    you switched to \"branch2\" (as long as the commit doesn't conflict with your\n+    working tree changes, see the \"DISCUSSION\" below for more details).\n \n Split a commit apart into a sequence of commits::\n +\n-- \n2.1.4\n\n"}]}