Merge branch 'maint-1.7.7' into maint

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

Junio C Hamano committed Jan 6, 2012 at 12:35 UTC cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b

No changes.