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: Re: [PATCH v6 0/3] rr/fmt-merge-msg replacement
Date: Thu, 26 Aug 2010 10:42:38 +0530 [thread overview]
Message-ID: <20100826051235.GA9407@kytes> (raw)
In-Reply-To: <7vhbiiqv8p.fsf@alter.siamese.dyndns.org>
Hi Junio,
Junio C Hamano writes:
> Ramkumar Ramachandra <artagnon@gmail.com> writes:
>
> > 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,
>
> Just as a future reference, in a case like this that results in trivial
> conflict, I'd prefer to see a patch that can be used independently from
> other unrelated branches.
Oh, okay. I think I realize why- if the dependent topics are ejected,
you'll have more trouble taking this forward to `next` and `master`,
right?
> Maybe you'd want a new test or two in t6200?
Good idea! It'll give me the chance to familiarize myself with
test-lib.sh :)
-- Ram
next prev parent reply other threads:[~2010-08-26 5:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-25 10:48 [PATCH v6 0/3] rr/fmt-merge-msg replacement Ramkumar Ramachandra
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 [this message]
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=20100826051235.GA9407@kytes \
--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).