Merge branch 'ph/rerere-doc' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 26 Mar 2012 19:10:12 +0000 (12:10 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 26 Mar 2012 19:10:12 +0000 (12:10 -0700)
* ph/rerere-doc:
  rerere: Document 'rerere remaining'


Trivial merge