[PATCH v6 0/3] rr/fmt-merge-msg replacement

Hi Junio,

This is a replacement for rr/fmt-merge-msg. It corrects the problems pointed out by Jonathan and adds one extra patch. Additionally, I've rebased it so there's no merge conflict when you merge it into `pu` (see: jn/merge-renormalize). 4/5 from v5 has been dropped.

Thanks.

Ramkumar Ramachandra (3):
  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

 Documentation/git-fmt-merge-msg.txt |   10 ++++--
 Documentation/merge-config.txt      |    6 ++-
 Documentation/merge-options.txt     |    6 ++--
 builtin.h                           |    7 ++--
 builtin/fmt-merge-msg.c             |   56 +++++++++++++++++-----------------
 builtin/merge.c                     |   29 ++++++++++--------
 6 files changed, 61 insertions(+), 53 deletions(-)