Change remote tracking to remote-tracking in non-trivial places

To complement the straightforward perl application in previous patch,
this adds a few manual changes.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 315f07ef1c6997c98c4e446af507c3e1e4566218..801aede6094e40b5bfb1f4c5d09393e7011f500e 100644 (file)
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -89,7 +89,7 @@ are not part of the current project most users will want to expire
 them sooner.  This option defaults to '30 days'.
 
 The above two configuration variables can be given to a pattern.  For
 them sooner.  This option defaults to '30 days'.
 
 The above two configuration variables can be given to a pattern.  For

-example, this sets non-default expiry values only to remote tracking
+example, this sets non-default expiry values only to remote-tracking

 branches:
 
 ------------
 branches:
 
 ------------


@@ -128,8 +128,8 @@ Notes
 
 'git gc' tries very hard to be safe about the garbage it collects. In
 particular, it will keep not only objects referenced by your current set
 
 'git gc' tries very hard to be safe about the garbage it collects. In
 particular, it will keep not only objects referenced by your current set

-of branches and tags, but also objects referenced by the index, remote
-tracking branches, refs saved by 'git filter-branch' in
+of branches and tags, but also objects referenced by the index,
+remote-tracking branches, refs saved by 'git filter-branch' in

 refs/original/, or reflogs (which may reference commits in branches
 that were later amended or rewound).
 
 refs/original/, or reflogs (which may reference commits in branches
 that were later amended or rewound).
 

diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index f1f4086389445a44645e57c2340cc94266f92835..0982f74ef6212577afb74d86079472662e2bffba 100644 (file)
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -402,8 +402,8 @@ could merge the changes into her master branch:
 alice$ git merge bob/master
 -------------------------------------
 
 alice$ git merge bob/master
 -------------------------------------
 

-This `merge` can also be done by 'pulling from her own remote
-tracking branch', like this:
+This `merge` can also be done by 'pulling from her own remote-tracking
+branch', like this:

 
 -------------------------------------
 alice$ git pull . remotes/bob/master
 
 -------------------------------------
 alice$ git pull . remotes/bob/master

diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 5bcf0b867adf3f57018a15ab8828713b986aaac6..b0b2684a1f879cc173bf2bc67902724ed8f25d48 100755 (executable)
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -129,7 +129,7 @@ test_expect_success 'denyNonFastforwards trumps --force' '
        test "$victim_orig" = "$victim_head"
 '
 
        test "$victim_orig" = "$victim_head"
 '
 

-test_expect_success 'push --all excludes remote tracking hierarchy' '
+test_expect_success 'push --all excludes remote-tracking hierarchy' '

        mkdir parent &&
        (
            cd parent &&
        mkdir parent &&
        (
            cd parent &&