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 v6 0/3] rr/fmt-merge-msg replacement
Date: Wed, 25 Aug 2010 16:18:47 +0530	[thread overview]
Message-ID: <1282733330-32334-1-git-send-email-artagnon@gmail.com> (raw)

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(-)

-- 
1.7.2.2.409.gdbb11.dirty

             reply	other threads:[~2010-08-25 10:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-25 10:48 Ramkumar Ramachandra [this message]
2010-08-25 10:48 ` [PATCH v6 1/3] fmt_merge_msg: Change fmt_merge_msg API to accept shortlog_len Ramkumar Ramachandra
2010-08-25 10:48 ` [PATCH v6 2/3] merge: Make '--log' an integer option for number of shortlog entries Ramkumar Ramachandra
2010-08-25 10:48 ` [PATCH v6 3/3] merge: Make 'merge.log' an integer or boolean option Ramkumar Ramachandra
2010-08-25 20:43 ` [PATCH v6 0/3] rr/fmt-merge-msg replacement Junio C Hamano
2010-08-26  5:12   ` Ramkumar Ramachandra
2010-08-26 16:58     ` Junio C Hamano

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=1282733330-32334-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).