Code

Merge branch 'ph/rerere-doc' into maint-1.7.8
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2012 20:34:09 +0000 (13:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Apr 2012 20:34:09 +0000 (13:34 -0700)
* ph/rerere-doc:
  rerere: Document 'rerere remaining'


Trivial merge