summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorDmitry Potapov <dpotapov@gmail.com>2008-04-14 12:17:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-04-23 04:53:37 (GMT)
commit208641cf850125a23ccca99630ea2caa70953e44 (patch)
tree403c7a285bf97079a1ffede521aef1963e31b462 /Documentation/user-manual.txt
parent34b5cd1fe9f9130b747388a1a968a8d4c9906865 (diff)
downloadgit-208641cf850125a23ccca99630ea2caa70953e44.zip
git-208641cf850125a23ccca99630ea2caa70953e44.tar.gz
git-208641cf850125a23ccca99630ea2caa70953e44.tar.bz2
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>
Diffstat (limited to 'Documentation/user-manual.txt')
-rw-r--r--Documentation/user-manual.txt17
1 files changed, 1 insertions, 16 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 565aeb9..86b91a5 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1548,22 +1548,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
Dangling objects are not a problem. At worst they may take up a little
extra disk space. They can sometimes provide a last-resort method for
-recovering lost work--see <<dangling-objects>> for details. However, if
-you wish, you can remove them with linkgit:git-prune[1] or the `--prune`
-option to linkgit:git-gc[1]:
-
--------------------------------------------------
-$ git gc --prune
--------------------------------------------------
-
-This may be time-consuming. Unlike most other git operations (including
-git-gc when run without any options), it is not safe to prune while
-other git operations are in progress in the same repository.
-
-If linkgit:git-fsck[1] complains about sha1 mismatches or missing
-objects, you may have a much more serious problem; your best option is
-probably restoring from backups. See
-<<recovering-from-repository-corruption>> for a detailed discussion.
+recovering lost work--see <<dangling-objects>> for details.
[[recovering-lost-changes]]
Recovering lost changes