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'

diff --cc Documentation/git-stash.txt
index 4b15459c8374c1a83d4ffa9e0fd1a984aada7621,a031836a26c562deb490819f9a7fe7e0c0034e9f..3dc16a108a15bdb4ea7a86d30dbaa6822969229a
--- 1/Documentation/git-stash.txt
--- 2/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@@ -13,7 -13,8 +13,8 @@@ SYNOPSI
  'git stash' drop [-q|--quiet] [<stash>]
  'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
  'git stash' branch <branchname> [<stash>]
- 'git stash' [save [--patch] [--[no-]keep-index] [-q|--quiet] [<message>]]
 -'git stash' [save [-k|--keep-index] [-q|--quiet] [<message>]]
++'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]]
+ 'git stash' [-k|--keep-index]
  'git stash' clear
  'git stash' create
  

diff --cc git-stash.sh
index 567aa5d725e38750b860b01a43ba01914e180ea1,13edc0eefd56507930055f57fa48c3bfb6863108..81a72f68cc47aed881b618f893d49c776fe52ae8
--- 1/git-stash.sh
--- 2/git-stash.sh
+++ b/git-stash.sh
@@@ -132,16 -99,9 +133,16 @@@ save_stash () 
        while test $# != 0
        do
                case "$1" in
-               --keep-index)
+               -k|--keep-index)
                        keep_index=t
                        ;;
 +              --no-keep-index)
 +                      keep_index=
 +                      ;;
 +              -p|--patch)
 +                      patch_mode=t
 +                      keep_index=t
 +                      ;;
                -q|--quiet)
                        GIT_QUIET=t
                        ;;