diff options
| author |  Stephen Haberman <stephen@exigencecorp.com> | 2008-09-29 04:12:04 -0500 |
|---|---|---|
| committer |  Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 08:13:10 -0700 |
| commit | 2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320 (patch) | |
| tree | 4983a7ddc5c5fbff74de6a4000d03bd5c53d7f85 | |
| parent | Remove empty directories in recursive merge (diff) | |
| download | tgif-2a79d2f662a5a82a6cfcfd2a0d980e7b1875f320.tar.xz | |
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>
| -rwxr-xr-x | git-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |