Merge branch 'mm/phrase-remote-tracking' into next

* mm/phrase-remote-tracking:
  git-branch.txt: mention --set-upstream as a way to change upstream configuration
  user-manual: remote-tracking can be checked out, with detached HEAD
  user-manual.txt: explain better the remote(-tracking) branch terms
  Change incorrect "remote branch" to "remote tracking branch" in C code
  Change incorrect uses of "remote branch" meaning "remote-tracking"
  Change "tracking branch" to "remote-tracking branch"
  everyday.txt: change "tracking branch" to "remote-tracking branch"
  Change remote tracking to remote-tracking in non-trivial places
  Replace "remote tracking" with "remote-tracking"
  Better "Changed but not updated" message in git-status

diff --cc Documentation/fetch-options.txt
Simple merge

diff --cc Documentation/rev-list-options.txt
Simple merge

diff --cc builtin/checkout.c
Simple merge

diff --cc builtin/fetch.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/remote.c
Simple merge