{"thread":{"id":"44810","subject":"[PATCH 1/2] stash: fix USAGE text","startedAt":"2017-01-03T16:06:46Z","lastAt":"2017-01-09T01:48:57Z","messageCount":3,"participants":["Marc Strapetz","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"308703","messageId":"20170103155356.11213-1-marc.strapetz@syntevo.com","threadId":"44810","inReplyTo":null,"subject":"[PATCH 1/2] stash: fix USAGE text","fromName":"Marc Strapetz","fromEmail":"marc.strapetz@syntevo.com","sentAt":"2017-01-03T15:53:55Z","receivedAt":"2017-01-03T16:06:46Z","isPatch":true,"sender":{"key":"marc.strapetz@syntevo.com","avatar":"https://avatars.githubusercontent.com/u/3380730?v=4"},"body":"Add missing usage description for stash subcommands\n'create' and 'store'.\n\nSigned-off-by: Marc Strapetz <marc.strapetz@syntevo.com>\n---\n git-stash.sh | 4 +++-\n 1 file changed, 3 insertions(+), 1 deletion(-)\n\ndiff --git a/git-stash.sh b/git-stash.sh\nindex 10c284d1a..c6b9db694 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -9,7 +9,9 @@ USAGE=\"list [<options>]\n    or: $dashless branch <branchname> [<stash>]\n    or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]\n \t\t       [-u|--include-untracked] [-a|--all] [<message>]]\n-   or: $dashless clear\"\n+   or: $dashless clear\n+   or: $dashless create [<message>]\n+   or: $dashless store [-m|--message <message>] [-q|--quiet] <commit>\"\n \n SUBDIRECTORY_OK=Yes\n OPTIONS_SPEC=\n-- \n2.11.0\n\n"},{"id":"308704","messageId":"20170103155356.11213-2-marc.strapetz@syntevo.com","threadId":"44810","inReplyTo":"20170103155356.11213-1-marc.strapetz@syntevo.com","subject":"[PATCH 2/2] stash: --[no-]include-untracked option for create","fromName":"Marc Strapetz","fromEmail":"marc.strapetz@syntevo.com","sentAt":"2017-01-03T15:53:56Z","receivedAt":"2017-01-03T16:07:32Z","isPatch":true,"sender":{"key":"marc.strapetz@syntevo.com","avatar":"https://avatars.githubusercontent.com/u/3380730?v=4"},"body":"Expose internal option to include untracked files\nfor the stash 'create' subcommand.\n\nSigned-off-by: Marc Strapetz <marc.strapetz@syntevo.com>\n---\n Documentation/git-stash.txt |  2 +-\n git-stash.sh                | 14 ++++++++++++--\n 2 files changed, 13 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt\nindex 2e9cef06e..cc7944e59 100644\n--- a/Documentation/git-stash.txt\n+++ b/Documentation/git-stash.txt\n@@ -16,7 +16,7 @@ SYNOPSIS\n 'git stash' [save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n \t     [-u|--include-untracked] [-a|--all] [<message>]]\n 'git stash' clear\n-'git stash' create [<message>]\n+'git stash' create [-u|--[no-]include-untracked] [<message>]\n 'git stash' store [-m|--message <message>] [-q|--quiet] <commit>\n \n DESCRIPTION\ndiff --git a/git-stash.sh b/git-stash.sh\nindex c6b9db694..16f5fe93e 100755\n--- a/git-stash.sh\n+++ b/git-stash.sh\n@@ -10,7 +10,7 @@ USAGE=\"list [<options>]\n    or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]\n \t\t       [-u|--include-untracked] [-a|--all] [<message>]]\n    or: $dashless clear\n-   or: $dashless create [<message>]\n+   or: $dashless create [-u|--[no-]include-untracked] [<message>]\n    or: $dashless store [-m|--message <message>] [-q|--quiet] <commit>\"\n \n SUBDIRECTORY_OK=Yes\n@@ -629,7 +629,17 @@ clear)\n \t;;\n create)\n \tshift\n-\tcreate_stash \"$*\" && echo \"$w_commit\"\n+\tcase \"$1\" in\n+\t-u|--include-untracked)\n+\t\tuntracked=untracked\n+\t\tshift\n+\t\t;;\n+\t--no-include-untracked)\n+\t\tuntracked=\n+\t\tshift\n+\t\t;;\n+\tesac\n+\tcreate_stash \"$*\" \"$untracked\" && echo \"$w_commit\"\n \t;;\n store)\n \tshift\n-- \n2.11.0\n\n"},{"id":"308974","messageId":"xmqqpojxypdr.fsf@gitster.mtv.corp.google.com","threadId":"44810","inReplyTo":"20170103155356.11213-1-marc.strapetz@syntevo.com","subject":"Re: [PATCH 1/2] stash: fix USAGE text","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-01-09T01:48:48Z","receivedAt":"2017-01-09T01:48:57Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Marc Strapetz <marc.strapetz@syntevo.com> writes:\n\n> Add missing usage description for stash subcommands\n> 'create' and 'store'.\n\nI think we didn't add them to usage description when we added them\nbecause these two are not end-user facing commands but for script\nwriters (who do not use \"$ git stash -h <ENTER>\" to learn how to\nuse).\n\nI dunno.\n\n> Signed-off-by: Marc Strapetz <marc.strapetz@syntevo.com>\n> ---\n>  git-stash.sh | 4 +++-\n>  1 file changed, 3 insertions(+), 1 deletion(-)\n>\n> diff --git a/git-stash.sh b/git-stash.sh\n> index 10c284d1a..c6b9db694 100755\n> --- a/git-stash.sh\n> +++ b/git-stash.sh\n> @@ -9,7 +9,9 @@ USAGE=\"list [<options>]\n>     or: $dashless branch <branchname> [<stash>]\n>     or: $dashless [save [--patch] [-k|--[no-]keep-index] [-q|--quiet]\n>  \t\t       [-u|--include-untracked] [-a|--all] [<message>]]\n> -   or: $dashless clear\"\n> +   or: $dashless clear\n> +   or: $dashless create [<message>]\n> +   or: $dashless store [-m|--message <message>] [-q|--quiet] <commit>\"\n>  \n>  SUBDIRECTORY_OK=Yes\n>  OPTIONS_SPEC=\n"}]}