[PATCH 0/5] Re-roll rr/fmt-merge-msg
- From
Ramkumar Ramachandra <artagnon@gmail.com>
- Date
- Sep 8, 2010, 17:59 UTC
- Message-ID
- <1283968797-31793-1-git-send-email-artagnon@gmail.com>
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 lengthDocumentation/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