summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:22:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-10-20 15:22:40 -0700
commitce555f38426e212ced5f2445bc6df1351af21cab (patch)
tree8aee761e69743957192889d3fff9b7c6fbaf88e2
parentMerge branch 'jk/filter-branch-use-of-sed-on-incomplete-line' into maint (diff)
parentDocumentation/gc: warn against --prune=<now> (diff)
downloadtgif-ce555f38426e212ced5f2445bc6df1351af21cab.tar.xz
Merge branch 'jc/doc-gc-prune-now' into maint
"git gc" is safe to run anytime only because it has the built-in grace period to protect young objects. In order to run with no grace period, the user must make sure that the repository is quiescent. * jc/doc-gc-prune-now: Documentation/gc: warn against --prune=<now>
-rw-r--r--Documentation/git-gc.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 52234987f9..fa1510480a 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -63,8 +63,11 @@ automatic consolidation of packs.
--prune=<date>::
Prune loose objects older than date (default is 2 weeks ago,
overridable by the config variable `gc.pruneExpire`).
- --prune=all prunes loose objects regardless of their age.
- --prune is on by default.
+ --prune=all prunes loose objects regardless of their age (do
+ not use --prune=all unless you know exactly what you are doing.
+ Unless the repository is quiescent, you will lose newly created
+ objects that haven't been anchored with the refs and end up
+ corrupting your repository). --prune is on by default.
--no-prune::
Do not prune any loose objects.