Changes since last time: Negative shortlog length is now treated as an
error. I've done it keeping in mind Jonathan's INF series.
Ramkumar Ramachandra (5):
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
t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog
length
t6200-fmt-merge-msg: Exercise '--log' to configure shortlog length
Documentation/git-fmt-merge-msg.txt | 16 ++++--
Documentation/merge-config.txt | 6 ++-
Documentation/merge-options.txt | 6 +-
builtin.h | 7 ++-
builtin/fmt-merge-msg.c | 60 ++++++++++++-----------
builtin/merge.c | 32 +++++++-----
t/t6200-fmt-merge-msg.sh | 91 +++++++++++++++++++++++++++++++++++
7 files changed, 163 insertions(+), 55 deletions(-)
--
1.7.2.2.409.gdbb11.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html