Merge branch 'jn/status-translatable'

[git.git] / Documentation / git-gc.txt

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index a01eef6763d8c0383121019e9c33c869f0300acf..4966cb57846412b097bbc8ba15d09005f4019340 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).
 


@@ -151,10 +151,6 @@ linkgit:git-reflog[1]
 linkgit:git-repack[1]
 linkgit:git-rerere[1]
 
 linkgit:git-repack[1]
 linkgit:git-rerere[1]
 

-Author
-------
-Written by Shawn O. Pearce <spearce@spearce.org>
-

 GIT
 ---
 Part of the linkgit:git[1] suite
 GIT
 ---
 Part of the linkgit:git[1] suite