@matheusbsbs / matheus-bagliano / commits / 208641cf85
Fork 0

git-gc --prune is deprecated

25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 made the '--prune' option deprecated and removed its description from the git-gc man page. This patch removes all references to this option from the rest of the Git documentation. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Dmitry Potapov committed Apr 14, 2008 at 16:17 UTC 208641cf850125a23ccca99630ea2caa70953e44
2 files changed +3 -20
Documentation/everyday.txt
+2 -4
@@ -48,14 +48,12 @@ $ git gc <3>
48 repository health reasonably well.
49 <2> check how many loose objects there are and how much
50 disk space is wasted by not repacking.
51 -<3> repacks the local repository and performs other housekeeping tasks. Running
52 -without `--prune` is a safe operation even while other ones are in progress.
51 +<3> repacks the local repository and performs other housekeeping tasks.
52
53 Repack a small project into single pack.::
54 +
55 ------------
56 $ git gc <1>
58 -$ git gc --prune
57 ------------
58 +
59 <1> pack all the objects reachable from the refs into one pack,
@@ -182,7 +180,7 @@ $ git pull <3>
180 $ git log -p ORIG_HEAD.. arch/i386 include/asm-i386 <4>
181 $ git pull git://git.kernel.org/pub/.../jgarzik/libata-dev.git ALL <5>
182 $ git reset --hard ORIG_HEAD <6>
185 -$ git gc --prune <7>
183 +$ git gc <7>
184 $ git fetch --tags <8>
185 ------------
186 +
Documentation/user-manual.txt
+1 -16
@@ -1548,22 +1548,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
1548
1549 Dangling objects are not a problem. At worst they may take up a little
1550 extra disk space. They can sometimes provide a last-resort method for
1551 -recovering lost work--see <<dangling-objects>> for details. However, if
1552 -you wish, you can remove them with linkgit:git-prune[1] or the `--prune`
1553 -option to linkgit:git-gc[1]:
1554 -
1555 --------------------------------------------------
1556 -$ git gc --prune
1557 --------------------------------------------------
1558 -
1559 -This may be time-consuming. Unlike most other git operations (including
1560 -git-gc when run without any options), it is not safe to prune while
1561 -other git operations are in progress in the same repository.
1562 -
1563 -If linkgit:git-fsck[1] complains about sha1 mismatches or missing
1564 -objects, you may have a much more serious problem; your best option is
1565 -probably restoring from backups. See
1566 -<<recovering-from-repository-corruption>> for a detailed discussion.
1551 +recovering lost work--see <<dangling-objects>> for details.
1552
1553 [[recovering-lost-changes]]
1554 Recovering lost changes