tree 11e63818a348f1f450d92f0a6bbd74a1ae19504c
parent ed6ce4382b5cb34e98ca3db2f19de82a037da322
parent 3e7a1df84d1eba94530d5bf62caa215f5d3e78d3
author Junio C Hamano <gitster@pobox.com> 1332789012 -0700
committer Junio C Hamano <gitster@pobox.com> 1332789012 -0700

Merge branch 'ph/rerere-doc' into maint

* ph/rerere-doc:
  rerere: Document 'rerere remaining'