From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Jakub Narebski <jnareb@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Sixt <j.sixt@viscovery.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Yaroslav Halchenko <debian@onerussian.com>
Subject: Re: [PATCH v2 4/4] fmt-merge-msg: Update fmt-merge-msg and merge-config documentation
Date: Fri, 20 Aug 2010 23:36:56 +0530 [thread overview]
Message-ID: <20100820180654.GB6211@kytes> (raw)
In-Reply-To: <m31v9tp4pv.fsf@localhost.localdomain>
Hi Jakub,
Jakub Narebski writes:
> Ramkumar Ramachandra <artagnon@gmail.com> 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@gmail.com>
> > ---
> > 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?
Hm, I think I found a bug in the option parser. Currently writing a patch.
$ git fmt-merge-msg --log < .git/FETCH_HEAD
error: option `log' requires a value
$ git fmt-merge-msg --log= < .git/FETCH_HEAD
$ # Works
-- Ram
prev parent reply other threads:[~2010-08-20 18:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-20 16:54 [PATCH v2 0/4] fmt-merge-msg improvements Ramkumar Ramachandra
2010-08-20 16:54 ` [PATCH v2 1/4] fmt-merge-msg: Make the number of log entries in commit message configurable Ramkumar Ramachandra
2010-08-20 16:54 ` [PATCH v2 2/4] fmt-merge-msg: Update command line options to sync with config options Ramkumar Ramachandra
2010-08-20 16:54 ` [PATCH v2 3/4] fmt-merge-msg: Remove deprecated --summary option Ramkumar Ramachandra
2010-08-20 16:54 ` [PATCH v2 4/4] fmt-merge-msg: Update fmt-merge-msg and merge-config documentation Ramkumar Ramachandra
2010-08-20 17:36 ` Jakub Narebski
2010-08-20 18:06 ` Ramkumar Ramachandra [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100820180654.GB6211@kytes \
--to=artagnon@gmail.com \
--cc=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=j.sixt@viscovery.net \
--cc=jnareb@gmail.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).