From: Ramkumar Ramachandra <artagnon@gmail.com>
Date: Wed, 25 Aug 2010 04:50:06 GMT
Subject: Re: [PATCH v5 2/5] merge: Make '--log' an integer option for number of shortlog entries
Message-ID: <20100825045003.GB3280@kytes>
In-Reply-To: <20100823222542.GD1308@burratino>

Hi Jonathan,

Jonathan Nieder writes:
> Ramkumar Ramachandra wrote:
> 
> >  Documentation/git-fmt-merge-msg.txt |   10 +++++-----
> >  Documentation/merge-options.txt     |    6 +++---
> >  builtin/fmt-merge-msg.c             |   25 ++++++++++++++-----------
> >  builtin/merge.c                     |   18 ++++++++++--------
> >  4 files changed, 32 insertions(+), 27 deletions(-)
> 
> Is this on top of "next"?  I had trouble applying it on top of the
> update-contrib-example-merge topic.
[...]

Due to an unfortunate mistake on my part, it's based on `pu`. I'll fix
all the issues you pointed out and re-roll on top of rr/fmt-merge-msg
later today. Thanks.

-- Ram