Merge branch 'ms/remote-tracking-branches-in-doc'

* ms/remote-tracking-branches-in-doc:
  Change "remote tracking" to "remote-tracking"

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc t/t5505-remote.sh
index ee5d65d52f6d1d4dba6b1664f4dae23ebe69429d,8d0f3e3078d665ddfb2b9ca23977ac3285b6cf13..8f6e3922dce2b676221610d83a87c5b36d3bc5b6
--- 1/t/t5505-remote.sh
--- 2/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@@ -61,25 -62,25 +61,25 @@@ test_expect_success C_LOCALE_OUTPUT 're
  '
  
  test_expect_success 'add another remote' '
 -(
 -      cd test &&
 -      git remote add -f second ../two &&
 -      tokens_match "origin second" "$(git remote)" &&
 -      check_tracking_branch second master side another &&
 -      git for-each-ref "--format=%(refname)" refs/remotes |
 -      sed -e "/^refs\/remotes\/origin\//d" \
 -          -e "/^refs\/remotes\/second\//d" >actual &&
 -      >expect &&
 -      test_cmp expect actual
 -)
 +      (
 +              cd test &&
 +              git remote add -f second ../two &&
 +              tokens_match "origin second" "$(git remote)" &&
 +              check_tracking_branch second master side another &&
 +              git for-each-ref "--format=%(refname)" refs/remotes |
 +              sed -e "/^refs\/remotes\/origin\//d" \
 +                  -e "/^refs\/remotes\/second\//d" >actual &&
 +              >expect &&
 +              test_cmp expect actual
 +      )
  '
  
- test_expect_success C_LOCALE_OUTPUT 'check remote tracking' '
+ test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
 -(
 -      cd test &&
 -      check_remote_track origin master side &&
 -      check_remote_track second master side another
 -)
 +      (
 +              cd test &&
 +              check_remote_track origin master side &&
 +              check_remote_track second master side another
 +      )
  '
  
  test_expect_success 'remote forces tracking branches' '