From: Stephen Haberman <stephen@exigencecorp.com>
Date: Mon, 29 Sep 2008 09:12:04 +0000 (-0500)
Subject: Clarify how the user can satisfy stash's 'dirty state' check.
X-Git-Tag: v1.6.0.3~59
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;ds=sidebyside;h=2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320;p=git.git

Clarify how the user can satisfy stash's 'dirty state' check.

Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-stash.sh b/git-stash.sh
index 6bd2572f7..42f626f9d 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -161,7 +161,7 @@ show_stash () {
 apply_stash () {
 	git update-index -q --refresh &&
 	git diff-files --quiet --ignore-submodules ||
-		die 'Cannot restore on top of a dirty state'
+		die 'Cannot apply to a dirty working tree, please stage your changes'
 
 	unstash_index=
 	case "$1" in