From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 15 Aug 2009 22:20:28 +0000 (-0700)
Subject: Merge branch 'js/stash-dwim' into tr/reset-checkout-patch
X-Git-Tag: v1.6.5-rc0~5^2~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=367ea191e659da05a2e79a7025d8628a02f8268a;p=git.git

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'
---

367ea191e659da05a2e79a7025d8628a02f8268a
diff --cc Documentation/git-stash.txt
index 4b15459c8,a031836a2..3dc16a108
--- a/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 567aa5d72,13edc0eef..81a72f68c
--- a/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
  			;;