Skip to content

Commit 60109d0

Browse files
moygitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0e615b2 commit 60109d0

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Documentation/git-gc.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ are not part of the current project most users will want to expire
8989
them sooner. This option defaults to '30 days'.
9090

9191
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
9393
branches:
9494

9595
------------
@@ -128,8 +128,8 @@ Notes
128128

129129
'git gc' tries very hard to be safe about the garbage it collects. In
130130
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
133133
refs/original/, or reflogs (which may reference commits in branches
134134
that were later amended or rewound).
135135

Documentation/gittutorial.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ could merge the changes into her master branch:
402402
alice$ git merge bob/master
403403
-------------------------------------
404404

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:
407407

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

t/t5400-send-pack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ test_expect_success 'denyNonFastforwards trumps --force' '
129129
test "$victim_orig" = "$victim_head"
130130
'
131131

132-
test_expect_success 'push --all excludes remote tracking hierarchy' '
132+
test_expect_success 'push --all excludes remote-tracking hierarchy' '
133133
mkdir parent &&
134134
(
135135
cd parent &&

0 commit comments

Comments
 (0)