Ramkumar Ramachandra <artagnon@xxxxxxxxx> writes: > Update the documentation of fmt-merge-msg and merge-config to reflect > the fact that `merge.log` can either be a boolean or integer option > now, instead of just a boolean. > > Signed-off-by: Ramkumar Ramachandra <artagnon@xxxxxxxxx> > --- > Documentation/git-fmt-merge-msg.txt | 20 +++++++++----------- > Documentation/merge-config.txt | 8 ++++++-- > 2 files changed, 15 insertions(+), 13 deletions(-) > > diff --git a/Documentation/git-fmt-merge-msg.txt b/Documentation/git-fmt-merge-msg.txt > index 78c8a6d..720af64 100644 > --- a/Documentation/git-fmt-merge-msg.txt > +++ b/Documentation/git-fmt-merge-msg.txt > @@ -9,8 +9,8 @@ git-fmt-merge-msg - Produce a merge commit message > SYNOPSIS > -------- > [verse] > -'git fmt-merge-msg' [-m <message>] [--log | --no-log] <$GIT_DIR/FETCH_HEAD > -'git fmt-merge-msg' [-m <message>] [--log | --no-log] -F <file> > +'git fmt-merge-msg' [-m <message>] [--log=<n> | --no-log] < $GIT_DIR/FETCH_HEAD > +'git fmt-merge-msg' [-m <message>] [--log=<n> | --no-log] -F <file> Shouldn't it be +'git fmt-merge-msg' [-m <message>] [--log[=<n>] | --no-log] -F <file> i.e. isn't <n> in '--log' optional? -- Jakub Narebski Poland ShadeHawk on #git -- 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