Merge branch 'vd/fsck-submodule-url-test'

[thirdparty/git.git] / builtin / cat-file.c

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 694c8538df2ff8200e214351e5e857530d2a1191..7d4899348a387b1a07377c2d968d7574a74d219d 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -15,7 +15,6 @@
 #include "parse-options.h"
 #include "userdiff.h"
 #include "streaming.h"
-#include "tree-walk.h"
 #include "oid-array.h"
 #include "packfile.h"
 #include "object-file.h"
@@ -922,11 +921,11 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
                N_("git cat-file <type> <object>"),
                N_("git cat-file (-e | -p) <object>"),
                N_("git cat-file (-t | -s) [--allow-unknown-type] <object>"),
+               N_("git cat-file (--textconv | --filters)\n"
+                  "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
                N_("git cat-file (--batch | --batch-check | --batch-command) [--batch-all-objects]\n"
                   "             [--buffer] [--follow-symlinks] [--unordered]\n"
                   "             [--textconv | --filters] [-Z]"),
-               N_("git cat-file (--textconv | --filters)\n"
-                  "             [<rev>:<path|tree-ish> | --path=<path|tree-ish> <rev>]"),
                NULL
        };
        const struct option options[] = {