{"thread":{"id":"48747","subject":"[PATCH] git-stash.txt: document show options","startedAt":"2018-06-21T00:56:41Z","lastAt":"2018-06-21T06:45:58Z","messageCount":2,"participants":["Mike Frysinger","Johannes Schindelin"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"350612","messageId":"20180621005633.31440-1-vapier@gentoo.org","threadId":"48747","inReplyTo":null,"subject":"[PATCH] git-stash.txt: document show options","fromName":"Mike Frysinger","fromEmail":"vapier@gentoo.org","sentAt":"2018-06-21T00:56:33Z","receivedAt":"2018-06-21T00:56:41Z","isPatch":true,"sender":{"key":"vapier@gentoo.org","avatar":"https://gravatar.com/avatar/e84e90ef943ceda7d1138ced7f3cc3f866dc1fdf9cb76313ffba167fb73fa057?d=mp&s=160"},"body":"Signed-off-by: Mike Frysinger <vapier@gentoo.org>\n---\n Documentation/git-stash.txt | 5 ++++-\n 1 file changed, 4 insertions(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\nindex 7ef8c4791177..76e4ca788102 100644\n--- a/Documentation/git-stash.txt\n+++ b/Documentation/git-stash.txt\n@@ -106,7 +106,7 @@ stash@{1}: On master: 9cc0589... Add git-stash\n The command takes options applicable to the 'git log'\n command to control what is shown and how. See linkgit:git-log[1].\n \n-show [<stash>]::\n+show [<options>] [<stash>]::\n \n \tShow the changes recorded in the stash entry as a diff between the\n \tstashed contents and the commit back when the stash entry was first\n@@ -116,6 +116,9 @@ show [<stash>]::\n \tto view the second most recent entry in patch form).\n \tYou can use stash.showStat and/or stash.showPatch config variables\n \tto change the default behavior.\n++\n+The command takes options applicable to the 'git diff'\n+command to control what is shown and how. See linkgit:git-diff[1].\n \n pop [--index] [-q|--quiet] [<stash>]::\n \n-- \n2.17.1\n\n"},{"id":"350613","messageId":"nycvar.QRO.7.76.6.1806210817200.11870@tvgsbejvaqbjf.bet","threadId":"48747","inReplyTo":"20180621005633.31440-1-vapier@gentoo.org","subject":"Re: [PATCH] git-stash.txt: document show options","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2018-06-21T06:21:33Z","receivedAt":"2018-06-21T06:45:58Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Mike,\n\nthere is a GSoC project going on to make `git stash` a builtin, and I\nthink that this change makes sense and at the same time needs to be\ncoordinated with Paul, who is performing that builtin work, so I Cc:ed him\nfor visibility.\n\nCiao,\nJohannes\n\nOn Wed, 20 Jun 2018, Mike Frysinger wrote:\n\n> Signed-off-by: Mike Frysinger <vapier@gentoo.org>\n> ---\n>  Documentation/git-stash.txt | 5 ++++-\n>  1 file changed, 4 insertions(+), 1 deletion(-)\n> \n> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\n> index 7ef8c4791177..76e4ca788102 100644\n> --- a/Documentation/git-stash.txt\n> +++ b/Documentation/git-stash.txt\n> @@ -106,7 +106,7 @@ stash@{1}: On master: 9cc0589... Add git-stash\n>  The command takes options applicable to the 'git log'\n>  command to control what is shown and how. See linkgit:git-log[1].\n>  \n> -show [<stash>]::\n> +show [<options>] [<stash>]::\n>  \n>  \tShow the changes recorded in the stash entry as a diff between the\n>  \tstashed contents and the commit back when the stash entry was first\n> @@ -116,6 +116,9 @@ show [<stash>]::\n>  \tto view the second most recent entry in patch form).\n>  \tYou can use stash.showStat and/or stash.showPatch config variables\n>  \tto change the default behavior.\n> ++\n> +The command takes options applicable to the 'git diff'\n> +command to control what is shown and how. See linkgit:git-diff[1].\n>  \n>  pop [--index] [-q|--quiet] [<stash>]::\n>  \n> -- \n> 2.17.1\n> \n> \n"}]}