Merge branch 'mv/remote-rename'

* mv/remote-rename:
git-remote: document the migration feature of the rename subcommand
git-remote rename: migrate from remotes/ and branches/
remote: add a new 'origin' variable to the struct
Implement git remote rename

diff --cc builtin-remote.c
Simple merge