X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-stash.sh;h=bbefdf64244063f4708f381b8a772466d64e90e5;hb=9b3497cab9986883ff2499722f8758795afa34b7;hp=4e2c7f83314954de6655b0d1bff773c31dfe3ed1;hpb=b83cfa5949081c32a13b84e8aeea7d2cb7a96331;p=thirdparty%2Fgit.git

diff --git a/git-stash.sh b/git-stash.sh
index 4e2c7f8331..bbefdf6424 100755
--- 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