Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
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