aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-05 15:11:07 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-05 15:11:07 -0800
commitd7194d318b98964a0c9705a02b4c3e3035642f03 (patch)
treec6cd20ea47608813b2f6154fdde59743414ebd12 /Documentation
parentc4c9a63b5434d008fdbfc8c41240d642cbe5147e (diff)
parent1e49f22f07881dffc04f8f09d4ad4e4a65b85b09 (diff)
downloadgit-d7194d318b98964a0c9705a02b4c3e3035642f03.tar.gz
git-d7194d318b98964a0c9705a02b4c3e3035642f03.tar.xz
Merge branch 'nd/fsck-progress'
* nd/fsck-progress: fsck: print progress fsck: avoid reading every object twice verify_packfile(): check as many object as possible in a pack fsck: return error code when verify_pack() goes wrong
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-fsck.txt11
1 files changed, 10 insertions, 1 deletions
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index a2a508dc2..0a17b4258 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -10,7 +10,8 @@ SYNOPSIS
--------
[verse]
'git fsck' [--tags] [--root] [--unreachable] [--cache] [--no-reflogs]
- [--[no-]full] [--strict] [--verbose] [--lost-found] [<object>*]
+ [--[no-]full] [--strict] [--verbose] [--lost-found]
+ [--[no-]progress] [<object>*]
DESCRIPTION
-----------
@@ -72,6 +73,14 @@ index file, all SHA1 references in .git/refs/*, and all reflogs (unless
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