fast-import: add 'ls' command

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

diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 315f07ef1c6997c98c4e446af507c3e1e4566218..26632414b2646ba80a17fa861d422a9c8c957810 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:
 
 ------------


@@ -107,7 +107,7 @@ how long records of conflicted merge you have not resolved are
 kept.  This defaults to 15 days.
 
 The optional configuration variable 'gc.packrefs' determines if
 kept.  This defaults to 15 days.
 
 The optional configuration variable 'gc.packrefs' determines if

-'git gc' runs 'git pack-refs'. This can be set to "nobare" to enable
+'git gc' runs 'git pack-refs'. This can be set to "notbare" to enable

 it within all non-bare repos or it can be set to a boolean value.
 This defaults to true.
 
 it within all non-bare repos or it can be set to a boolean value.
 This defaults to true.
 


@@ -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).