![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:35:05 +0000 (12:35 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:35:05 +0000 (12:35 -0800) | ||
| commit | 8769e93327f5efc26d179d794a67a5b993cd3693 | |
| tree | 0f5cd5640dd8acd8dd6867fcb1d54d3cd0cb34f0 | tree | snapshot |
| parent | c07aa5b218b9f519c29b5be71fe43cd79365dd37 | commit | diff |
| parent | 07b88a00c0caac055a9f52167523248a75711842 | commit | diff |
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
* maint-1.7.6:
Documentation: rerere.enabled is the primary way to configure rerere
| Documentation/config.txt | diff1 | | diff2 | | blob | history |