[PATCH v2 00/10] More consistant terminology ("remote-tracking branch", "not updated")

Here's a new version that should address Jonathan's remarks.

I've reworded a bit the user-manual.txt changes, they may adress
Thore's remark, but we can probably do better. But no time for that
now ;-).

Matthieu Moy (10):
  Better "Changed but not updated" message in git-status
  Replace "remote tracking" with "remote-tracking"
  Change remote tracking to remote-tracking in non-trivial places
  Change "tracking branch" to "remote-tracking branch"
  Change "tracking branch" to "remote-tracking branch" in C code
  Change incorrect uses of "remote branch" meaning "remote-tracking"
  Change incorrect "remote branch" to "remote tracking branch" in C
    code
  Use 'remote-tracking branch' in generated merge messages
  user-manual.txt: explain better the remote(-tracking) branch terms
  git-branch.txt: mention --set-upstream as a way to change upstream
    configuration

 Documentation/config.txt               |   13 ++++++-----
 Documentation/everyday.txt             |    6 ++--
 Documentation/fetch-options.txt        |    2 +-
 Documentation/git-branch.txt           |   14 +++++++-----
 Documentation/git-checkout.txt         |    2 +-
 Documentation/git-clone.txt            |    2 +-
 Documentation/git-describe.txt         |    2 +-
 Documentation/git-fetch.txt            |    2 +-
 Documentation/git-gc.txt               |    6 ++--
 Documentation/git-log.txt              |    2 +-
 Documentation/git-pull.txt             |    8 +++---
 Documentation/git-remote.txt           |    6 ++--
 Documentation/git-tag.txt              |    4 +-
 Documentation/gittutorial-2.txt        |    2 +-
 Documentation/gittutorial.txt          |    6 ++--
 Documentation/glossary-content.txt     |    8 +++---
 Documentation/rev-list-options.txt     |    2 +-
 Documentation/user-manual.txt          |   30 ++++++++++++++++++++-------
 branch.h                               |    2 +-
 builtin/checkout.c                     |    4 +-
 builtin/fetch.c                        |    6 ++--
 builtin/fmt-merge-msg.c                |    6 ++--
 builtin/merge.c                        |    2 +-
 builtin/remote.c                       |    6 ++--
 contrib/examples/builtin-fetch--tool.c |    2 +-
 remote.c                               |    2 +-
 t/t1507-rev-parse-upstream.sh          |    2 +-
 t/t3409-rebase-preserve-merges.sh      |    2 +-
 t/t5400-send-pack.sh                   |    2 +-
 t/t5505-remote.sh                      |    8 ++++--
 t/t5513-fetch-track.sh                 |    2 +-
 t/t7508-status.sh                      |   34 ++++++++++++++++----------------
 t/t7608-merge-messages.sh              |    4 +-
 wt-status.c                            |    2 +-
 34 files changed, 111 insertions(+), 92 deletions(-)

-- 
1.7.3.2.183.g2e7b0