projects
/
git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
wildmatch: make wildmatch's return value compatible with fnmatch
[git]
/
git-stash.sh
diff --git
a/git-stash.sh
b/git-stash.sh
index
4e2c7f8
..
bbefdf6
100755
(executable)
--- a/
git-stash.sh
+++ b/
git-stash.sh
@@
-469,6
+469,7
@@
apply_stash () {
else
# Merge conflict; keep the exit status from merge-recursive
status=$?
+ git rerere
if test -n "$INDEX_OPTION"
then
gettextln "Index was not unstashed." >&2