From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Johannes Sixt <j.sixt@viscovery.net>,
Jonathan Nieder <jrnieder@gmail.com>,
Yaroslav Halchenko <debian@onerussian.com>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v5 0/5] merge --log configurability
Date: Sun, 22 Aug 2010 21:56:33 +0530 [thread overview]
Message-ID: <1282494398-20542-1-git-send-email-artagnon@gmail.com> (raw)
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
next reply other threads:[~2010-08-22 16:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-22 16:26 Ramkumar Ramachandra [this message]
2010-08-22 16:26 ` [PATCH v5 1/5] fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len Ramkumar Ramachandra
2010-08-23 22:00 ` Jonathan Nieder
2010-08-24 17:16 ` Junio C Hamano
2010-08-25 2:44 ` [PATCH rr/fmt-merge-msg] merge, fmt_merge_msg --log: default value is DEFAULT_MERGE_LOG_LEN Jonathan Nieder
2010-08-22 16:26 ` [PATCH v5 2/5] merge: Make '--log' an integer option for number of shortlog entries Ramkumar Ramachandra
2010-08-23 22:25 ` Jonathan Nieder
2010-08-25 4:50 ` Ramkumar Ramachandra
2010-08-22 16:26 ` [PATCH v5 3/5] merge: Make 'merge.log' an integer or boolean option Ramkumar Ramachandra
2010-08-24 19:01 ` Junio C Hamano
2010-08-25 3:52 ` Ramkumar Ramachandra
2010-08-22 16:26 ` [PATCH v5 4/5] fmt-merge-msg: Remove deprecated '--summary' option Ramkumar Ramachandra
2010-08-22 16:26 ` [PATCH v5 5/5] parse-options: clarify PARSE_OPT_NOARG description Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1282494398-20542-1-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=debian@onerussian.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j.sixt@viscovery.net \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).