From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 Jan 2012 20:35:05 +0000 (-0800)
Subject: Merge branch 'maint-1.7.6' into maint-1.7.7
X-Git-Tag: v1.7.8.3~2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8769e93327f5efc26d179d794a67a5b993cd3693;p=git.git

Merge branch 'maint-1.7.6' into maint-1.7.7

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

8769e93327f5efc26d179d794a67a5b993cd3693