summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorStephen Haberman <stephen@exigencecorp.com>2008-09-29 09:12:04 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2008-09-29 15:13:10 (GMT)
commit2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320 (patch)
tree4983a7ddc5c5fbff74de6a4000d03bd5c53d7f85 /git-stash.sh
parent41f13af558db1018250ade4d99a51f0b76f65bc8 (diff)
downloadgit-2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320.zip
git-2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320.tar.gz
git-2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320.tar.bz2
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>
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh
index 6bd2572..42f626f 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