git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 4/4] fmt-merge-msg: Update fmt-merge-msg and merge-config documentation

From
Ramkumar Ramachandra <artagnon@gmail.com>
Date
Aug 20, 2010, 18:06 UTC
Message-ID
<20100820180654.GB6211@kytes>
In-Reply-To
<m31v9tp4pv.fsf@localhost.localdomain>
Hi Jakub,
Jakub Narebski writes:
Show 30 quoted lines
> 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
Previous: Jakub Narebski
Message 7 of 7 in “fmt-merge-msg improvements”
  1. 0/4 fmt-merge-msg improvementsRamkumar Ramachandra, Aug 20, 2010
  2. 1/4 fmt-merge-msg: Make the number of log entries in commit message configurableRamkumar Ramachandra, Aug 20, 2010
  3. 2/4 fmt-merge-msg: Update command line options to sync with config optionsRamkumar Ramachandra, Aug 20, 2010
  4. 3/4 fmt-merge-msg: Remove deprecated --summary optionRamkumar Ramachandra, Aug 20, 2010
  5. 4/4 fmt-merge-msg: Update fmt-merge-msg and merge-config documentationRamkumar Ramachandra, Aug 20, 2010
  6. Jakub NarebskiAug 20, 2010
  7. Ramkumar RamachandraAug 20, 2010

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.