[PATCH 03/10] Change remote tracking to remote-tracking in non-trivial places
- From
Matthieu Moy <matthieu.moy@imag.fr>
- Date
- Nov 2, 2010, 15:31 UTC
- Message-ID
- <1288711888-21528-4-git-send-email-Matthieu.Moy@imag.fr>
- In-Reply-To
- <1288711888-21528-1-git-send-email-Matthieu.Moy@imag.fr>
To complement the straightforward perl application in previous patch, this adds a few manual changes.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> --- Documentation/git-gc.txt | 6 +++--- Documentation/gittutorial.txt | 4 ++-- t/t5400-send-pack.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 315f07e..801aede 100644 --- 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 -example, this sets non-default expiry values only to remote tracking +example, this sets non-default expiry values only to remote-tracking 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 -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). diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index f1f4086..0982f74 100644 --- 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 ------------------------------------- -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 diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh index 5bcf0b8..b0b2684 100755 --- 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_expect_success 'push --all excludes remote tracking hierarchy' ' +test_expect_success 'push --all excludes remote-tracking hierarchy' ' mkdir parent && ( cd parent &&
-- 1.7.3.2.183.g2e7b0