On Wed, Apr 29, 2015 at 8:56 AM, Karthik Nayak <karthik.188@xxxxxxxxx> wrote: > cat-file: add documentation for '--allow-unkown-type' option. Drop the end-of-line period. > Signed-off-by: Karthik Nayak <karthik.188@xxxxxxxxx> It's not clear why this change is done separately from patch 3/5 (cat-file: teach cat-file a '--allow-unknown-type' option). Given how small this patch is and considering how closely related it is to the actual introduction of the --allow-unknown-type option, it might make sense to fold it into 3/5. > --- > diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt > index f6a16f4..f6f6064 100644 > --- a/Documentation/git-cat-file.txt > +++ b/Documentation/git-cat-file.txt > @@ -9,7 +9,7 @@ git-cat-file - Provide content or type and size information for repository objec > SYNOPSIS > -------- > [verse] > -'git cat-file' (-t | -s | -e | -p | <type> | --textconv ) <object> > +'git cat-file' (-t [--allow-unkown-type]| -s [--allow-unkown-type]| -e | -p | <type> | --textconv ) <object> > 'git cat-file' (--batch | --batch-check) < <list-of-objects> > > DESCRIPTION > @@ -69,6 +69,9 @@ OPTIONS > not be combined with any other options or arguments. See the > section `BATCH OUTPUT` below for details. > > +--allow-unkown-type:: > + Allow -s or -t to query broken/corrupt objects of unknown type. > + > OUTPUT > ------ > If '-t' is specified, one of the <type>. > -- > 2.4.0.rc1.250.g565e85b -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html