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: http://git.ipfire.org/?a=commitdiff_plain;h=7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c;p=thirdparty%2Fgit.git

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

7267404dc5a84e7a4c81a55eb3bf22e14bcc7d1c