diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-19 17:49:42 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-19 17:49:42 -0800 |
| commit | f29db856e7a736dd5109223d71c548367bc127ae (patch) | |
| tree | f4ae1561dcf0fe8914a95b1beceb970fb10ec3fa /Documentation | |
| parent | 4de0bbd8985ea057050994c5b254c9ef3d845c1e (diff) | |
| parent | 05bb5a2584ca0e1c87a2135a83c5573b9337d06f (diff) | |
| download | git-f29db856e7a736dd5109223d71c548367bc127ae.tar.gz | |
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')
| -rw-r--r-- | Documentation/config.txt | 2 | ||||
| -rw-r--r-- | Documentation/git-fsck.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-gc.txt | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index bf9479e4eb..54597f1897 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -996,7 +996,7 @@ gc.packrefs:: Running `git pack-refs` in a repository renders it unclonable by Git versions prior to 1.5.1.2 over dumb transports such as HTTP. This variable determines whether - 'git gc' runs `git pack-refs`. This can be set to `nobare` + '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. The default is `true`. diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt index 3ad48a6336..86f9b2bf91 100644 --- a/Documentation/git-fsck.txt +++ b/Documentation/git-fsck.txt @@ -123,9 +123,6 @@ dangling <type> <object>:: The <type> object <object>, is present in the database but never 'directly' used. A dangling commit could be a root node. -warning: git-fsck: tree <tree> has full pathnames in it:: - And it shouldn't... - sha1 mismatch <object>:: The database has an object who's sha1 doesn't match the database value. diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 801aede609..26632414b2 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. |