From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 3 Jun 2016 21:38:01 +0000 (-0700)
Subject: Merge branch 'js/rebase-i-dedup-call-to-rerere'
X-Git-Tag: v2.9.0-rc2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c?hp=be3ac81f0c73252b7df34522e4886c4427eb43ae

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
---

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"
 }