Merge branch 'maint'

* maint:
  Documentation/config.txt: Mention branch.<name>.rebase applies to "git pull"
  doc: clarify definition of "update" for git-add -u

diff --cc Documentation/config.txt
Simple merge

diff --cc Documentation/git-add.txt
Simple merge