Merge branch 'mm/phrase-remote-tracking'

* 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 --combined Documentation/fetch-options.txt
index 5ce1e727458bfa5e73ad98c7a852bd7c0f034c6b,a435c23138a6c85bedb83e7df3286575fe2bbe6e..678675ccdf06dbe0e97d80bb3fbc8985155d2fc0
--- 1/Documentation/fetch-options.txt
--- 2/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@@ -36,7 -36,7 +36,7 @@@ ifndef::git-pull[
  
  -p::
  --prune::
-       After fetching, remove any remote tracking branches which
+       After fetching, remove any remote-tracking branches which
        no longer exist on the remote.
  endif::git-pull[]
  
@@@ -53,7 -53,6 +53,7 @@@ endif::git-pull[
        behavior for a remote may be specified with the remote.<name>.tagopt
        setting. See linkgit:git-config[1].
  
 +ifndef::git-pull[]
  -t::
  --tags::
        Most of the tags are fetched automatically as branch
@@@ -64,7 -63,6 +64,7 @@@
        downloaded. The default behavior for a remote may be
        specified with the remote.<name>.tagopt setting. See
        linkgit:git-config[1].
 +endif::git-pull[]
  
  -u::
  --update-head-ok::

diff --combined Documentation/git-pull.txt
index e1b0bd2868e5f4c489f698038c4d4aaae7740c52,54e7013bab1b12d8f7d950bd15fa08a6eea9e1dd..e47361f2345bba78c917ab58bfe61800aa1e7156
--- 1/Documentation/git-pull.txt
--- 2/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@@ -26,7 -26,7 +26,7 @@@ With `--rebase`, it runs 'git rebase' i
  <repository> should be the name of a remote repository as
  passed to linkgit:git-fetch[1].  <refspec> can name an
  arbitrary remote ref (for example, the name of a tag) or even
- a collection of refs with corresponding remote tracking branches
+ a collection of refs with corresponding remote-tracking branches
  (e.g., refs/heads/*:refs/remotes/origin/*), but usually it is
  the name of a branch in the remote repository.
  
@@@ -92,14 -92,12 +92,14 @@@ include::merge-options.txt[
  :git-pull: 1
  
  --rebase::
 -      Instead of a merge, perform a rebase after fetching.  If
 -      there is a remote ref for the upstream branch, and this branch
 -      was rebased since last fetched, the rebase uses that information
 -      to avoid rebasing non-local changes. To make this the default
 -      for branch `<name>`, set configuration `branch.<name>.rebase`
 -      to `true`.
 +      Rebase the current branch on top of the upstream branch after
 +      fetching.  If there is a remote-tracking branch corresponding to
 +      the upstream branch and the upstream branch was rebased since last
 +      fetched, the rebase uses that information to avoid rebasing
 +      non-local changes.
 ++
 +See `branch.<name>.rebase` in linkgit:git-config[1] if you want to make
 +`git pull` always use `{litdd}rebase` instead of merging.
  +
  [NOTE]
  This is a potentially _dangerous_ mode of operation.
@@@ -136,7 -134,7 +136,7 @@@ and if there is not any such variable, 
  in `$GIT_DIR/remotes/<origin>` file is used.
  
  In order to determine what remote branches to fetch (and
- optionally store in the tracking branches) when the command is
+ optionally store in the remote-tracking branches) when the command is
  run without any refspec parameters on the command line, values
  of the configuration variable `remote.<origin>.fetch` are
  consulted, and if there aren't any, `$GIT_DIR/remotes/<origin>`
@@@ -149,9 -147,9 +149,9 @@@ refs/heads/*:refs/remotes/origin/
  ------------
  
  A globbing refspec must have a non-empty RHS (i.e. must store
- what were fetched in tracking branches), and its LHS and RHS
+ what were fetched in remote-tracking branches), and its LHS and RHS
  must end with `/*`.  The above specifies that all remote
- branches are tracked using tracking branches in
+ branches are tracked using remote-tracking branches in
  `refs/remotes/origin/` hierarchy under the same name.
  
  The rule to determine which remote branch to merge after

diff --combined Documentation/rev-list-options.txt
index 42ca059908b6af5726d958d92912705c96235d29,7a1b164ccdd7ff1c9297ead7671a552bc18a3e89..44a2ef1de15bdce5d67a151a1cb6150031e57c7e
--- 1/Documentation/rev-list-options.txt
--- 2/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@@ -95,8 -95,6 +95,8 @@@ you would get an output like this
        to be printed in between commits, in order for the graph history
        to be drawn properly.
  +
 +This enables parent rewriting, see 'History Simplification' below.
 ++
  This implies the '--topo-order' option by default, but the
  '--date-order' option may also be specified.
  
@@@ -148,9 -146,6 +148,9 @@@ options may be given. See linkgit:git-d
  -t::
  
        Show the tree objects in the diff output. This implies '-r'.
 +
 +-s::
 +      Suppress diff output.
  endif::git-rev-list[]
  
  Commit Limiting
@@@ -269,7 -264,7 +269,7 @@@ endif::git-rev-list[
  
        Pretend as if all the refs in `refs/remotes` are listed
        on the command line as '<commit>'. If '<pattern>' is given, limit
-       remote tracking branches to ones matching given shell glob.
+       remote-tracking branches to ones matching given shell glob.
        If pattern lacks '?', '*', or '[', '/*' at the end is implied.
  
  --glob=<glob-pattern>::