Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
branch: factor out delete_branch_config()
[gitweb.git]
/
git-stash.sh
diff --git
a/git-stash.sh
b/git-stash.sh
index 4e2c7f83314954de6655b0d1bff773c31dfe3ed1..bbefdf64244063f4708f381b8a772466d64e90e5 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