From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jan 2012 20:35:12 +0000 (-0800)
Subject: Merge branch 'maint-1.7.7' into maint
X-Git-Tag: v1.7.8.3~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b;p=thirdparty%2Fgit.git

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
  Documentation: rerere.enabled is the primary way to configure rerere
---

cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b