The current git-stash behaviour is very error prone to typos. For example, if you typed "git-stash llist", git-stash would think that you wanted to save to a stash named "llist", but in fact, you meant "git-stash list". Signed-off-by: Kevin Leung <kevinlsk@xxxxxxxxx> --- git-stash.sh | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 77c9421..a17cc25 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (c) 2007, Nanako Shiraishi -USAGE='[ | list | show | apply | clear]' +USAGE='[ | save | list | show | apply | clear ]' SUBDIRECTORY_OK=Yes . git-sh-setup @@ -195,6 +195,10 @@ show) shift show_stash "$@" ;; +save) + shift + save_stash "$@" && git-reset --hard + ;; apply) shift apply_stash "$@" @@ -202,14 +206,12 @@ apply) clear) clear_stash ;; -help | usage) - usage - ;; *) - if test $# -gt 0 && test "$1" = save + if test "$#" -eq "0" then - shift + save_stash && git-reset --hard + else + usage fi - save_stash "$*" && git-reset --hard ;; esac -- 1.5.3.7-dirty - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html