summaryrefslogtreecommitdiffstats
path: root/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-03-02 11:52:47 -0800
committerJunio C Hamano <gitster@pobox.com>2012-03-02 11:52:47 -0800
commit81d540a73a86a44d48b7d05d8f0dd25964499181 (patch)
tree83ea92ce212c58bb49a00e03ddd74f671b84bc49 /user-manual.txt
parent90a5b7b5da0a41417934a3b1e28330ff00de4a84 (diff)
downloadgit-htmldocs-81d540a73a86a44d48b7d05d8f0dd25964499181.tar.gz
Autogenerated HTML docs for v1.7.9.2-358-g22243
Diffstat (limited to 'user-manual.txt')
-rw-r--r--user-manual.txt15
1 files changed, 7 insertions, 8 deletions
diff --git a/user-manual.txt b/user-manual.txt
index f13a84613..6c7fee7ef 100644
--- a/user-manual.txt
+++ b/user-manual.txt
@@ -1582,7 +1582,7 @@ Checking the repository for corruption
The linkgit:git-fsck[1] command runs a number of self-consistency checks
on the repository, and reports on any problems. This may take some
-time. The most common warning by far is about "dangling" objects:
+time.
-------------------------------------------------
$ git fsck
@@ -1597,9 +1597,11 @@ 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.
+You will see informational messages on dangling objects. They are objects
+that still exist in the repository but are no longer referenced by any of
+your branches, and can (and will) be removed after a while with "gc".
+You can run `git fsck --no-dangling` to supress these messages, and still
+view real errors.
[[recovering-lost-changes]]
Recovering lost changes
@@ -3295,15 +3297,12 @@ it is with linkgit:git-fsck[1]; this may be time-consuming.
Assume the output looks like this:
------------------------------------------------
-$ git fsck --full
+$ git fsck --full --no-dangling
broken link from tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8
to blob 4b9458b3786228369c63936db65827de3cc06200
missing blob 4b9458b3786228369c63936db65827de3cc06200
------------------------------------------------
-(Typically there will be some "dangling object" messages too, but they
-aren't interesting.)
-
Now you know that blob 4b9458b3 is missing, and that the tree 2d9263c6
points to it. If you could find just one copy of that missing blob
object, possibly in some other repository, you could move it into