From: Thomas Rast <trast@student.ethz.ch>
Date: Thu, 13 Aug 2009 12:29:45 +0000 (+0200)
Subject: DWIM 'git stash save -p' for 'git stash -p'
X-Git-Tag: v1.6.5-rc0~5^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f300fab5440f25aabb22c6d1fec411ee10e154b1;p=git.git

DWIM 'git stash save -p' for 'git stash -p'

Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 3dc16a108..1c4ed412a 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
 'git stash' branch <branchname> [<stash>]
 'git stash' [save [--patch] [-k|--[no-]keep-index] [-q|--quiet] [<message>]]
-'git stash' [-k|--keep-index]
+'git stash' [-p|--patch|-k|--keep-index]
 'git stash' clear
 'git stash' create
 
diff --git a/git-stash.sh b/git-stash.sh
index 81a72f68c..9fd72894c 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -406,8 +406,8 @@ branch)
 	apply_to_branch "$@"
 	;;
 *)
-	case $#,"$1" in
-	0,|1,-k|1,--keep-index)
+	case $#,"$1","$2" in
+	0,,|1,-k,|1,--keep-index,|1,-p,|1,--patch,|2,-p,--no-keep-index|2,--patch,--no-keep-index)
 		save_stash "$@" &&
 		say '(To restore them type "git stash apply")'
 		;;