From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Dec 2007 07:01:02 +0000 (-0800)
Subject: Merge branch 'js/rebase-i-rerere'
X-Git-Tag: v1.5.4-rc0~104
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ac4d528ec18ae13a45166ef2afa9ffbba35f736f;p=git.git

Merge branch 'js/rebase-i-rerere'

* js/rebase-i-rerere:
  rebase -i: give rerere a chance
---

ac4d528ec18ae13a45166ef2afa9ffbba35f736f