aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-13 13:00:02 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-13 13:00:02 -0700
commit1718aab3e434575f3faef0afd3c66552e42f178f (patch)
tree0bf28e18b265b923f808bf5cee37358cb728d0f9 /Documentation
parentae44b235d49db30324819f4775897d9a74ee1aad (diff)
parent3b67d2917a0e93aa583c4069f5a00655e05dbd84 (diff)
downloadgit-1718aab3e434575f3faef0afd3c66552e42f178f.tar.gz
git-1718aab3e434575f3faef0afd3c66552e42f178f.tar.xz
Merge branch 'jc/unpack'
* jc/unpack: unpack-objects -r: call it "recover". unpack-objects desperately salvages objects from a corrupt pack
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-unpack-objects.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/Documentation/git-unpack-objects.txt b/Documentation/git-unpack-objects.txt
index c20b38b08..ff6184b0f 100644
--- a/Documentation/git-unpack-objects.txt
+++ b/Documentation/git-unpack-objects.txt
@@ -8,7 +8,7 @@ git-unpack-objects - Unpack objects from a packed archive
SYNOPSIS
--------
-'git-unpack-objects' [-n] [-q] <pack-file
+'git-unpack-objects' [-n] [-q] [-r] <pack-file
DESCRIPTION
@@ -34,6 +34,12 @@ OPTIONS
The command usually shows percentage progress. This
flag suppresses it.
+-r::
+ When unpacking a corrupt packfile, the command dies at
+ the first corruption. This flag tells it to keep going
+ and make the best effort to recover as many objects as
+ possible.
+
Author
------