{"thread":{"id":"19745","subject":"[PATCH] git-stash.txt: update synopsis, pop description","startedAt":"2009-06-08T16:56:05Z","lastAt":"2009-06-08T16:56:05Z","messageCount":1,"participants":["Brandon Casey"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"115820","messageId":"bJxDhbQFsPIm1ZUO8mSkwwlB-otpEtzhr6sRzDVsNjTkeMld-7T4NskTGr48iYOe3w8KU1kPuDA@cipher.nrlssc.navy.mil","threadId":"19745","inReplyTo":null,"subject":"[PATCH] git-stash.txt: update synopsis, pop description","fromName":"Brandon Casey","fromEmail":"casey@nrlssc.navy.mil","sentAt":"2009-06-08T16:56:05Z","receivedAt":"2009-06-08T16:56:05Z","isPatch":true,"sender":{"key":"drafnel@gmail.com","avatar":"https://avatars.githubusercontent.com/u/921167?v=4"},"body":"From: Brandon Casey <drafnel@gmail.com>\n\nInternally, the 'pop' subcommand of git-stash calls the 'apply' subcommand.\nHence, 'pop' accepts the same options as 'apply'.  Make this clear by\nplacing 'apply' and 'pop' next to each other in the synopsis, and state it\nexplicitly in the description of 'pop'.\n\nSigned-off-by: Brandon Casey <drafnel@gmail.com>\n---\n Documentation/git-stash.txt |    6 +++---\n 1 files changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\nindex 1cc24cc..7dda416 100644\n--- a/Documentation/git-stash.txt\n+++ b/Documentation/git-stash.txt\n@@ -9,8 +9,8 @@ SYNOPSIS\n --------\n [verse]\n 'git stash' list [<options>]\n-'git stash' (show | drop | pop ) [<stash>]\n-'git stash' apply [--index] [<stash>]\n+'git stash' (show | drop) [<stash>]\n+'git stash' (apply | pop) [--index] [<stash>]\n 'git stash' branch <branchname> [<stash>]\n 'git stash' [save [--keep-index] [<message>]]\n 'git stash' clear\n@@ -80,7 +80,7 @@ pop [<stash>]::\n \tRemove a single stashed state from the stash list and apply it\n \ton top of the current working tree state, i.e., do the inverse\n \toperation of `git stash save`. The working directory must\n-\tmatch the index.\n+\tmatch the index.  `pop` accepts the same options as `apply`.\n +\n Applying the state can fail with conflicts; in this case, it is not\n removed from the stash list. You need to resolve the conflicts by hand\n-- \n1.6.3.1.24.g152f4\n"}]}