diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:54:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-03 15:54:12 -0700 |
| commit | 799beac15391004778186503bf198783960a82a3 (patch) | |
| tree | 5afcd08f04bf24fca4db44bdfbff4f9e2182abb0 /git-stash.sh | |
| parent | 19801d6a2768b9ce056da4635a287885d08940cb (diff) | |
| parent | 743bf6d8b07f0c5717bf5c37b8b50ae9de619c83 (diff) | |
| download | git-799beac15391004778186503bf198783960a82a3.tar.gz | |
Merge branch 'ph/stash-rerere'
"git stash" internally used "git merge-recursive" backend, which did
not trigger "rerere" upon conflicts unlike other mergy operations.
* 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 |