diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-21 04:02:18 -0700 |
| commit | a660534e06147f8867d6c9b6c41025427a7b5c6c (patch) | |
| tree | 0ba8f85b478e0642ee775df82a94c3640217d756 /Documentation/config.txt | |
| parent | 455bda993cceb42921c9ff173da26651f1d66602 (diff) | |
| parent | 03cb91b18cc7f9c19c053c97711f592cebddb5f4 (diff) | |
| download | git-a660534e06147f8867d6c9b6c41025427a7b5c6c.tar.gz git-a660534e06147f8867d6c9b6c41025427a7b5c6c.tar.xz | |
Merge branch 'jc/maint-no-reflog-expire-unreach-for-head'
* jc/maint-no-reflog-expire-unreach-for-head:
reflog --expire-unreachable: special case entries in "HEAD" reflog
more war on "sleep" in tests
Document gc.<pattern>.reflogexpire variables
Conflicts:
Documentation/config.txt
Diffstat (limited to 'Documentation/config.txt')
| -rw-r--r-- | Documentation/config.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 39140bad4..1e402e087 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -946,13 +946,19 @@ gc.pruneexpire:: unreachable objects immediately. gc.reflogexpire:: +gc.<pattern>.reflogexpire:: 'git reflog expire' removes reflog entries older than - this time; defaults to 90 days. + this time; defaults to 90 days. With "<pattern>" (e.g. + "refs/stash") in the middle the setting applies only to + the refs that match the <pattern>. gc.reflogexpireunreachable:: +gc.<ref>.reflogexpireunreachable:: 'git reflog expire' removes reflog entries older than this time and are not reachable from the current tip; - defaults to 30 days. + defaults to 30 days. With "<pattern>" (e.g. "refs/stash") + in the middle, the setting applies only to the refs that + match the <pattern>. gc.rerereresolved:: Records of conflicted merge you resolved earlier are |