summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-01-21 21:29:44 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2007-01-21 21:29:57 -0800
commit026aa93818a536c819a94aae5bbefe1b6251fe0e (patch)
tree4c03787020e72a0957972900f10a5905b1661bec /Documentation
parentDocumentation/tutorial-2: Fix interesting typo in an example. (diff)
downloadtgif-026aa93818a536c819a94aae5bbefe1b6251fe0e.tar.xz
Revert "prune: --grace=time"
This reverts commit 9b088c4e394df84232cfd37aea78349a495b09c1. Protecting 'mature' objects does not make it any safer. We should admit that git-prune is inherently unsafe when run in parallel with other operations without involving unwarranted locking overhead, and with the latest git, even rebase and reset would not immediately create crufts anyway.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-prune.txt9
1 files changed, 1 insertions, 8 deletions
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index fbd344da40..a11e303094 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -8,7 +8,7 @@ git-prune - Prunes all unreachable objects from the object database
SYNOPSIS
--------
-'git-prune' [-n] [--grace=<time>]
+'git-prune' [-n] [--] [<head>...]
DESCRIPTION
-----------
@@ -28,12 +28,6 @@ OPTIONS
Do not remove anything; just report what it would
remove.
---grace=<time>::
- Do not prune loose objects that are younger than the
- specified time. This gives a grace period to newly
- created objects from getting pruned.
-
-////////////////////////////////////////////
\--::
Do not interpret any more arguments as options.
@@ -52,7 +46,6 @@ borrows from your repository via its
------------
$ git prune $(cd ../another && $(git-rev-parse --all))
------------
-////////////////////////////////////////////
Author
------