Merge branch 'js/pull-rebase-i'

"git pull --rebase" has been extended to allow invoking
"rebase -i".

* js/pull-rebase-i:
completion: add missing branch.*.rebase values
remote: handle the config setting branch.*.rebase=interactive
pull: allow interactive rebase with --rebase=interactive

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/pull.c
Simple merge

diff --cc contrib/completion/git-completion.bash
Simple merge