From 2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320 Mon Sep 17 00:00:00 2001 From: Stephen Haberman Date: Mon, 29 Sep 2008 04:12:04 -0500 Subject: [PATCH] Clarify how the user can satisfy stash's 'dirty state' check. Signed-off-by: Stephen Haberman Signed-off-by: Shawn O. Pearce --- git-stash.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-stash.sh b/git-stash.sh index 6bd2572f77..42f626f9d5 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 -- 2.11.4.GIT