git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
	Jonathan Nieder <jrnieder@gmail.com>
Subject: [PATCH 0/5] Re-roll rr/fmt-merge-msg
Date: Wed,  8 Sep 2010 23:29:52 +0530	[thread overview]
Message-ID: <1283968797-31793-1-git-send-email-artagnon@gmail.com> (raw)

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

             reply	other threads:[~2010-09-08 18:02 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-08 17:59 Ramkumar Ramachandra [this message]
2010-09-08 17:59 ` [PATCH 1/5] fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len Ramkumar Ramachandra
2010-09-08 17:59 ` [PATCH 2/5] merge: Make '--log' an integer option for number of shortlog entries Ramkumar Ramachandra
2010-09-08 17:59 ` [PATCH 3/5] merge: Make 'merge.log' an integer or boolean option Ramkumar Ramachandra
2010-09-08 17:59 ` [PATCH 4/5] t6200-fmt-merge-msg: Exercise 'merge.log' to configure shortlog length Ramkumar Ramachandra
2010-09-08 17:59 ` [PATCH 5/5] t6200-fmt-merge-msg: Exercise '--log' " 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1283968797-31793-1-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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.
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 NNTP newsgroup(s).