summaryrefslogtreecommitdiff
path: root/Documentation/git-gc.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:18 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-05-21 11:02:18 (GMT)
commita660534e06147f8867d6c9b6c41025427a7b5c6c (patch)
tree0ba8f85b478e0642ee775df82a94c3640217d756 /Documentation/git-gc.txt
parent455bda993cceb42921c9ff173da26651f1d66602 (diff)
parent03cb91b18cc7f9c19c053c97711f592cebddb5f4 (diff)
downloadgit-a660534e06147f8867d6c9b6c41025427a7b5c6c.zip
git-a660534e06147f8867d6c9b6c41025427a7b5c6c.tar.gz
git-a660534e06147f8867d6c9b6c41025427a7b5c6c.tar.bz2
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/git-gc.txt')
-rw-r--r--Documentation/git-gc.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 189573a..a9e0882 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -88,6 +88,16 @@ commits prior to the amend or rebase occurring. Since these changes
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
+example, this sets non-default expiry values only to remote tracking
+branches:
+
+------------
+[gc "refs/remotes/*"]
+ reflogExpire = never
+ reflogexpireUnreachable = 3 days
+------------
+
The optional configuration variable 'gc.rerereresolved' indicates
how long records of conflicted merge you resolved earlier are
kept. This defaults to 60 days.