diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-27 08:55:08 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-27 08:55:08 +0300 |
| commit | 96352ef9b4dfeb38ec796e7eab010edfe8f978ba (patch) | |
| tree | 23ef65fd24b4fcfff8610be002f566ded95d9eee /Documentation | |
| parent | 030faf2fa55d938db006125d4f3db41115c31d37 (diff) | |
| parent | 6e96cb5286105bbcf19d5c47e45334ef9a75d09d (diff) | |
Merge branch 'jc/cutoff-config'
"[gc] rerereResolved = 5.days" used to be invalid, as the variable
is defined to take an integer counting the number of days. It now
is allowed.
* jc/cutoff-config:
rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved
rerere: represent time duration in timestamp_t internally
t4200: parameterize "rerere gc" custom expiry test
t4200: gather "rerere gc" together
t4200: make "rerere gc" test more robust
t4200: give us a clean slate after "rerere gc" tests
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 602c6bef68..9b42e0ca73 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1564,11 +1564,13 @@ gc.<pattern>.reflogExpireUnreachable:: gc.rerereResolved:: Records of conflicted merge you resolved earlier are kept for this many days when 'git rerere gc' is run. + You can also use more human-readable "1.month.ago", etc. The default is 60 days. See linkgit:git-rerere[1]. gc.rerereUnresolved:: Records of conflicted merge you have not resolved are kept for this many days when 'git rerere gc' is run. + You can also use more human-readable "1.month.ago", etc. The default is 15 days. See linkgit:git-rerere[1]. gitcvs.commitMsgAnnotation:: |