summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-10-16 21:42:50 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-10-16 21:42:50 (GMT)
commitd5d1e35acef0fc41c7af242a9229f812894c7ea7 (patch)
tree8f74b30cee30fc00403518fb700fdb6d8c4af3ae
parent8b70042569044c95ab50a0b0a5ee20a1c876b36d (diff)
parentfae1a901ec1811a325c6ccf7acac281e615478f0 (diff)
downloadgit-d5d1e35acef0fc41c7af242a9229f812894c7ea7.zip
git-d5d1e35acef0fc41c7af242a9229f812894c7ea7.tar.gz
git-d5d1e35acef0fc41c7af242a9229f812894c7ea7.tar.bz2
Merge branch 'jc/doc-gc-prune-now'
"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 5223498..fa15104 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.