Merge branch 'jc/rerere'

* jc/rerere:
Teach --[no-]rerere-autoupdate option to merge, revert and friends

diff --cc builtin-commit.c
Simple merge

diff --cc builtin-merge.c
Simple merge

diff --cc builtin-rerere.c
Simple merge

diff --cc git-rebase.sh
Simple merge