summaryrefslogtreecommitdiffstats
path: root/builtin-fsck.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-02-06 06:08:53 +0100
committerJunio C Hamano <gitster@pobox.com>2010-02-06 06:08:53 +0100
commit76d44c8cfda9be1db78884580ab045c421b083fe (patch)
tree9ac31805cf463c84b0bd097e5246a1711181323b /builtin-fsck.c
parentis_submodule_modified(): fix breakage with external GIT_INDEX_FILE (diff)
parentreceive-pack: Send hook output over side band #2 (diff)
downloadgit-76d44c8cfda9be1db78884580ab045c421b083fe.tar.xz
git-76d44c8cfda9be1db78884580ab045c421b083fe.zip
Merge branch 'sp/maint-push-sideband' into sp/push-sideband
* sp/maint-push-sideband: receive-pack: Send hook output over side band #2 receive-pack: Wrap status reports inside side-band-64k receive-pack: Refactor how capabilities are shown to the client send-pack: demultiplex a sideband stream with status data run-command: support custom fd-set in async run-command: Allow stderr to be a caller supplied pipe Update git fsck --full short description to mention packs Conflicts: run-command.c
Diffstat (limited to 'builtin-fsck.c')
-rw-r--r--builtin-fsck.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fsck.c b/builtin-fsck.c
index 0e5faae381..0929c7f245 100644
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -578,7 +578,7 @@ static struct option fsck_opts[] = {
OPT_BOOLEAN(0, "root", &show_root, "report root nodes"),
OPT_BOOLEAN(0, "cache", &keep_cache_objects, "make index objects head nodes"),
OPT_BOOLEAN(0, "reflogs", &include_reflogs, "make reflogs head nodes (default)"),
- OPT_BOOLEAN(0, "full", &check_full, "also consider alternate objects"),
+ OPT_BOOLEAN(0, "full", &check_full, "also consider packs and alternate objects"),
OPT_BOOLEAN(0, "strict", &check_strict, "enable more strict checking"),
OPT_BOOLEAN(0, "lost-found", &write_lost_and_found,
"write dangling objects in .git/lost-found"),