![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:35:12 +0000 (12:35 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 6 Jan 2012 20:35:12 +0000 (12:35 -0800) | ||
| commit | cfdfc5a3b2289dd54a25d7523c0cf4d3e6efd84b | |
| tree | 503da39e6dd48ce65ac8c19668c647f034fdf47e | tree | snapshot |
| parent | 1327d83954bcf755094995b63317b23986c550f2 | commit | diff |
| parent | 8769e93327f5efc26d179d794a67a5b993cd3693 | commit | diff |
Merge branch 'maint-1.7.7' into maint
* maint-1.7.7:
Documentation: rerere.enabled is the primary way to configure rerere
* maint-1.7.7:
Documentation: rerere.enabled is the primary way to configure rerere
| Documentation/config.txt | diff1 | | diff2 | | blob | history |