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>
Matthieu Moy committed
Nov 2, 2010 at 16:31 UTC
60109d0ef5974b5066b6998fafe1da7187174c88
3 files changed
+6
-6
Documentation/git-gc.txt
+3
-3
@@ -89,7 +89,7 @@ are not part of the current project most users will want to expire
89
them sooner. This option defaults to '30 days'.
90
91
The above two configuration variables can be given to a pattern. For
92
-example, this sets non-default expiry values only to remote tracking
92
+example, this sets non-default expiry values only to remote-tracking
93
branches:
94
95
------------
@@ -128,8 +128,8 @@ Notes
128
129
'git gc' tries very hard to be safe about the garbage it collects. In
130
particular, it will keep not only objects referenced by your current set
131
-of branches and tags, but also objects referenced by the index, remote
132
-tracking branches, refs saved by 'git filter-branch' in
131
+of branches and tags, but also objects referenced by the index,
132
+remote-tracking branches, refs saved by 'git filter-branch' in
133
refs/original/, or reflogs (which may reference commits in branches
134
that were later amended or rewound).
135
Documentation/gittutorial.txt
+2
-2
@@ -402,8 +402,8 @@ could merge the changes into her master branch:
402
alice$ git merge bob/master
403
-------------------------------------
404
405
-This `merge` can also be done by 'pulling from her own remote
406
-tracking branch', like this:
405
+This `merge` can also be done by 'pulling from her own remote-tracking
406
+branch', like this:
407
408
-------------------------------------
409
alice$ git pull . remotes/bob/master
t/t5400-send-pack.sh
+1
-1
@@ -129,7 +129,7 @@ test_expect_success 'denyNonFastforwards trumps --force' '
129
test "$victim_orig" = "$victim_head"
130
'
131
132
-test_expect_success 'push --all excludes remote tracking hierarchy' '
132
+test_expect_success 'push --all excludes remote-tracking hierarchy' '
133
mkdir parent &&
134
(
135
cd parent &&