[RFC PATCH] stash: accept options also when subcommand 'save' is omitted
From: Matthieu Moy <hidden>
Date: 2016-06-15 22:47:16
Subsystem:
documentation, the rest · Maintainers:
Jonathan Corbet, Linus Torvalds
This allows in particular 'git stash --keep-index' which is shorter than 'git stash save --keep-index', and not ambiguous. Signed-off-by: Matthieu Moy <redacted> --- Does this sound right? I'm so used to 'git stash' (without saying 'save') that I keep typing 'git stash --keep-index', and get a usage string as an error message. Documentation/git-stash.txt | 2 +- git-stash.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 2f5ca7b..6f251e7 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt@@ -13,7 +13,7 @@ SYNOPSIS 'git stash' drop [-q|--quiet] [<stash>] 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>] 'git stash' branch <branchname> [<stash>] -'git stash' [save [--keep-index] [-q|--quiet] [<message>]] +'git stash' [save] [--keep-index] [-q|--quiet] [<message>] 'git stash' clear 'git stash' create
diff --git a/git-stash.sh b/git-stash.sh
index 03e589f..2599410 100755
--- a/git-stash.sh
+++ b/git-stash.sh@@ -7,7 +7,7 @@ USAGE="list [<options>] or: $dashless drop [-q|--quiet] [<stash>] or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>] or: $dashless branch <branchname> [<stash>] - or: $dashless [save [--keep-index] [-q|--quiet] [<message>]] + or: $dashless [save] [--keep-index] [-q|--quiet] [<message>] or: $dashless clear" SUBDIRECTORY_OK=Yes
@@ -302,6 +302,12 @@ apply_to_branch () { drop_stash $stash } +case "$1" in + -*) + set "save" "$@" + ;; +esac + # Main command set case "$1" in list)
--
1.6.4.173.g0591