From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jan 2010 02:13:01 +0000 (-0800)
Subject: Merge branch 'jc/rerere'
X-Git-Tag: v1.7.0-rc0~83
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4a88fb7ffc32bdfdfab2605430514d92aba25b8a;p=git.git

Merge branch 'jc/rerere'

* jc/rerere:
  Teach --[no-]rerere-autoupdate option to merge, revert and friends
---

4a88fb7ffc32bdfdfab2605430514d92aba25b8a