From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Dec 2011 19:27:27 +0000 (-0800)
Subject: Merge branch 'jk/doc-fsck'
X-Git-Tag: v1.7.9-rc0~26
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a4c628d71d43a00acbf42ff5704d9f812babc39d;p=git.git

Merge branch 'jk/doc-fsck'

* jk/doc-fsck:
  docs: brush up obsolete bits of git-fsck manpage

Conflicts:
	Documentation/git-fsck.txt
---

a4c628d71d43a00acbf42ff5704d9f812babc39d
diff --cc Documentation/git-fsck.txt
index 0a17b4258,55b33d703..6c47395ad
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@@ -73,29 -72,15 +73,23 @@@ index file, all SHA1 references in .git
  	a blob, the contents are written into the file, rather than
  	its object name.
  
 +--progress::
 +--no-progress::
 +	Progress status is reported on the standard error stream by
 +	default when it is attached to a terminal, unless
 +	--no-progress or --verbose is specified. --progress forces
 +	progress status even if the standard error stream is not
 +	directed to a terminal.
 +
- It tests SHA1 and general object sanity, and it does full tracking of
- the resulting reachability and everything else. It prints out any
- corruption it finds (missing or bad objects), and if you use the
- '--unreachable' flag it will also print out objects that exist but
- that aren't reachable from any of the specified head nodes.
- 
- So for example
- 
- 	git fsck --unreachable HEAD \
- 		$(git for-each-ref --format="%(objectname)" refs/heads)
+ DISCUSSION
+ ----------
  
- will do quite a _lot_ of verification on the tree. There are a few
- extra validity tests to be added (make sure that tree objects are
- sorted properly etc), but on the whole if 'git fsck' is happy, you
- do have a valid tree.
+ git-fsck tests SHA1 and general object sanity, and it does full tracking
+ of the resulting reachability and everything else. It prints out any
+ corruption it finds (missing or bad objects), and if you use the
+ '--unreachable' flag it will also print out objects that exist but that
+ aren't reachable from any of the specified head nodes (or the default
+ set, as mentioned above).
  
  Any corrupt objects you will have to find in backups or other archives
  (i.e., you can just remove them and do an 'rsync' with some other site in