projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
41f13af
)
Clarify how the user can satisfy stash's 'dirty state' check.
author
Stephen Haberman
<stephen@exigencecorp.com>
Mon, 29 Sep 2008 09:12:04 +0000
(
04:12
-0500)
committer
Shawn O. Pearce
<spearce@spearce.org>
Mon, 29 Sep 2008 15:13:10 +0000
(08:13 -0700)
Signed-off-by: Stephen Haberman <stephen@exigencecorp.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
git-stash.sh
patch
|
blob
|
history
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 ||
- 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