git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c07aa5b 07b88a0)
Merge branch 'maint-1.7.6' into maint-1.7.7
authorJunio C Hamano <redacted>
Fri, 6 Jan 2012 20:35:05 +0000 (12:35 -0800)
committerJunio C Hamano <redacted>
Fri, 6 Jan 2012 20:35:05 +0000 (12:35 -0800)
* maint-1.7.6:
  Documentation: rerere.enabled is the primary way to configure rerere

1  2 
Documentation/config.txt patch | diff1 | diff2 | blob | history

diff --cc Documentation/config.txt
Simple merge
git clone https://git.99rst.org/PROJECT