Merge branch 'ph/rerere-doc'
authorJunio C Hamano <gitster@pobox.com>
Tue, 13 Mar 2012 19:35:22 +0000 (12:35 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 13 Mar 2012 19:35:22 +0000 (12:35 -0700)
By Phil Hord
* ph/rerere-doc:
  rerere: Document 'rerere remaining'


Trivial merge