summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-08-15 22:20:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-08-15 22:20:28 (GMT)
commit367ea191e659da05a2e79a7025d8628a02f8268a (patch)
tree0273a3decb6efe958e9c665208f1f2236d0cc8c4 /git-stash.sh
parentdda1f2a5c3aca5072aada32eef159067ba16f0e9 (diff)
parentea41cfc4f54f884582dbda307287f12bb1fc15e9 (diff)
downloadgit-367ea191e659da05a2e79a7025d8628a02f8268a.zip
git-367ea191e659da05a2e79a7025d8628a02f8268a.tar.gz
git-367ea191e659da05a2e79a7025d8628a02f8268a.tar.bz2
Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
* commit 'tr/reset-checkout-patch^^2': Make 'git stash -k' a short form for 'git stash save --keep-index'
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh16
1 files changed, 9 insertions, 7 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 567aa5d..81a72f6 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -7,7 +7,8 @@ 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 [-k|--keep-index] [-q|--quiet] [<message>]]
+ or: $dashless [-k|--keep-index]
or: $dashless clear"
SUBDIRECTORY_OK=Yes
@@ -132,7 +133,7 @@ save_stash () {
while test $# != 0
do
case "$1" in
- --keep-index)
+ -k|--keep-index)
keep_index=t
;;
--no-keep-index)
@@ -405,12 +406,13 @@ branch)
apply_to_branch "$@"
;;
*)
- if test $# -eq 0
- then
- save_stash &&
+ case $#,"$1" in
+ 0,|1,-k|1,--keep-index)
+ save_stash "$@" &&
say '(To restore them type "git stash apply")'
- else
+ ;;
+ *)
usage
- fi
+ esac
;;
esac