summaryrefslogtreecommitdiff
path: root/Documentation/git-gc.txt
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-11-02 15:31:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-03 16:19:08 (GMT)
commit60109d0ef5974b5066b6998fafe1da7187174c88 (patch)
tree1d80ece33944d16bea32c447c01369b0a8b25900 /Documentation/git-gc.txt
parent0e615b252f35006ea824fae1a95dc6af55326b9a (diff)
downloadgit-60109d0ef5974b5066b6998fafe1da7187174c88.zip
git-60109d0ef5974b5066b6998fafe1da7187174c88.tar.gz
git-60109d0ef5974b5066b6998fafe1da7187174c88.tar.bz2
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>
Diffstat (limited to 'Documentation/git-gc.txt')
-rw-r--r--Documentation/git-gc.txt6
1 files changed, 3 insertions, 3 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).