Sync with 1.6.5.5

Signed-off-by: Junio C Hamano <redacted>

diff --cc Documentation/Makefile
Simple merge

diff --cc Documentation/git.txt
Simple merge

diff --cc builtin-rerere.c
Simple merge