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 6bd2572f7745cbd35fb59c3449b84f1929d9ab08..42f626f9d555f26f3e50441c0ab27de5cac19bf4 100755 (executable)
--- 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 ||
 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
 
        unstash_index=
        case "$1" in