[PATCH v4 0/5] fmt-merge-msg improvements

This version uses PARSE_OPT_OPTARG instead of PARSE_OPT_NOOPT. Also,
there are a few minor fixes from Jonathan's reviews.

Junio: If the --summary shouldn't be removed before 1.8.0, feel free
to drop PATCH 4/5 for now. I've made it independent of the other
patches in this round.

Jonathan Nieder (1):
  parse-options: clarify PARSE_OPT_NOARG description

Ramkumar Ramachandra (4):
  fmt-merge-msg: Make the number of log entries in commit message
    configurable
  fmt-merge-msg: Update command line options to sync with config
    options
  fmt-merge-msg: Update fmt-merge-msg and merge-config documentation
  fmt-merge-msg: Remove deprecated --summary option

 Documentation/git-fmt-merge-msg.txt |   24 +++++++------------
 Documentation/merge-config.txt      |    8 ++++-
 builtin/fmt-merge-msg.c             |   44 ++++++++++++++++------------------
 parse-options.h                     |    2 +-
 4 files changed, 37 insertions(+), 41 deletions(-)

-- 
1.7.2.2.409.gdbb11.dirty