summaryrefslogtreecommitdiff
path: root/Documentation/git-gc.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-12-20 01:49:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-12-20 01:49:42 (GMT)
commitf29db856e7a736dd5109223d71c548367bc127ae (patch)
treef4ae1561dcf0fe8914a95b1beceb970fb10ec3fa /Documentation/git-gc.txt
parent4de0bbd8985ea057050994c5b254c9ef3d845c1e (diff)
parent05bb5a2584ca0e1c87a2135a83c5573b9337d06f (diff)
downloadgit-f29db856e7a736dd5109223d71c548367bc127ae.zip
git-f29db856e7a736dd5109223d71c548367bc127ae.tar.gz
git-f29db856e7a736dd5109223d71c548367bc127ae.tar.bz2
Merge branch 'maint'
* maint: gitweb: Include links to feeds in HTML header only for '200 OK' response fsck docs: remove outdated and useless diagnostic userdiff: fix typo in ruby and python word regexes trace.c: mark file-local function static Fix typo in git-gc document.
Diffstat (limited to 'Documentation/git-gc.txt')
-rw-r--r--Documentation/git-gc.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 801aede..2663241 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -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
-'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.