[PATCH v5 0/5] merge --log configurability

This series is a complete rewrite after Jonathan's last review. I've
tried to pay close attention to detail and be as careful as possible-
let me know if I've missed something.

Thanks.

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

Ramkumar Ramachandra (4):
  fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len
  merge: Make '--log' an integer option for number of shortlog entries
  merge: Make 'merge.log' an integer or boolean option
  fmt-merge-msg: Remove deprecated '--summary' option

 Documentation/git-fmt-merge-msg.txt |   23 +++++----------
 Documentation/merge-config.txt      |    8 ++++-
 Documentation/merge-options.txt     |   11 ++-----
 builtin.h                           |    5 +--
 builtin/fmt-merge-msg.c             |   49 ++++++++++++++++------------------
 builtin/merge.c                     |   25 +++++++++++------
 parse-options.h                     |    2 +-
 7 files changed, 59 insertions(+), 64 deletions(-)

-- 
1.7.2.2.409.gdbb11.dirty