summaryrefslogtreecommitdiff
path: root/git-rebase--interactive.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-03 14:38:01 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-03 14:38:01 -0700
commit7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c (patch)
tree31100feaac30d0eba5831512e2dd6a259137354a /git-rebase--interactive.sh
parentbe3ac81f0c73252b7df34522e4886c4427eb43ae (diff)
parent7063693d51778815cfb9a4bc1e4e6d16f13589e7 (diff)
downloadgit-7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c.tar.gz
Merge branch 'js/rebase-i-dedup-call-to-rerere'
"git rebase -i", after it fails to auto-resolve the conflict, had an unnecessary call to "git rerere" from its very early days, which was spotted recently; the call has been removed. * js/rebase-i-dedup-call-to-rerere: rebase -i: remove an unnecessary 'rerere' invocation
Diffstat (limited to 'git-rebase--interactive.sh')
-rw-r--r--git-rebase--interactive.sh1
1 files changed, 0 insertions, 1 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 9d2bfb7a16..6e96abcc3c 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -192,7 +192,6 @@ make_patch () {
die_with_patch () {
echo "$1" > "$state_dir"/stopped-sha
make_patch "$1"
- git rerere
die "$2"
}