diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-04 00:01:52 -0700 |
commit | f63237a18e951b93ac46a0e594f286255e1eaaaf (patch) | |
tree | a131e9466bc5ca7ca42e31e71274ce3152dc8615 /Documentation/git-fsck-objects.txt | |
parent | Merge branch 'jc/fmt-patch' into next (diff) | |
parent | Cleanup git-send-email.perl:extract_valid_email (diff) | |
download | tgif-f63237a18e951b93ac46a0e594f286255e1eaaaf.tar.xz |
Merge branch 'vb/sendemail' into next
* vb/sendemail:
Cleanup git-send-email.perl:extract_valid_email
read-tree --reset: update working tree file for conflicted paths.
Documentation: Spelling fixes
Builtin git-rev-parse.
fetch: do not report "same" unless -verbose.
Diffstat (limited to 'Documentation/git-fsck-objects.txt')
-rw-r--r-- | Documentation/git-fsck-objects.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fsck-objects.txt b/Documentation/git-fsck-objects.txt index 93ce9dcc92..d0af99d351 100644 --- a/Documentation/git-fsck-objects.txt +++ b/Documentation/git-fsck-objects.txt @@ -71,7 +71,7 @@ sorted properly etc), but on the whole if "git-fsck-objects" is happy, you do have a valid tree. Any corrupt objects you will have to find in backups or other archives -(ie you can just remove them and do an "rsync" with some other site in +(i.e., you can just remove them and do an "rsync" with some other site in the hopes that somebody else has the object you have corrupted). Of course, "valid tree" doesn't mean that it wasn't generated by some |