diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:12 -0700 |
| commit | ef92392b6c8596b61eab6f2045a54c086f340cf7 (patch) | |
| tree | 961a30992de888f4fd135507cb33ebf1f6bfcf56 /git-stash.sh | |
| parent | Merge branch 'jc/maint-sane-execvp-notdir' into maint-1.7.11 (diff) | |
| parent | stash: invoke rerere in case of conflict (diff) | |
| download | tgif-ef92392b6c8596b61eab6f2045a54c086f340cf7.tar.xz | |
Merge branch 'ph/stash-rerere' into maint-1.7.11
* ph/stash-rerere:
stash: invoke rerere in case of conflict
test: git-stash conflict sets up rerere
Diffstat (limited to 'git-stash.sh')
| -rwxr-xr-x | git-stash.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 |