From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 28 Jul 2015 18:36:57 GMT
Subject: Re: [PATCH 2/6] Documentation/config: mention "now" and "never" for 'expire' settings
Message-ID: <xmqqzj2gdt86.fsf@gitster.dls.corp.google.com>
In-Reply-To: <CAPig+cTbTi5Uj_BFWBQ+rDc0=PhY1pu9Emr9TwTwPzGCeE5J2A@mail.gmail.com>

Eric Sunshine <sunshine@sunshineco.com> writes:

> I was just getting ready to re-roll this series[1] to address
> Michael's comments[2] and noticed that the add-on patch 7/6 which I
> sent later[3] seems to have been botched when Junio applied it to
> 'pu'. It's currently at 36598db (Documentation/git-tools: drop
> references to defunct tools, 2015-07-24) in
> es/doc-clean-outdated-tools and it appears that the --scissors option
> didn't cut off the leading cruft from the email conversation, thus the
> commit has the wrong "subject" plus a bunch of email conversation gunk
> in the commit message which doesn't belong. I understand that Junio
> uses a relatively bleeding-edge version of Git for his day-to-day work
> and was wondering if this is possible fallout from the git-am rewrite
> in C?

It is more likely that I was just lazy, knowing that the patch [3]
would not hit "next" and I'll have a more relaxed time to amend it
after the release was done, and let "am -s" without "-c" take it.

I just tried to re-apply the patch with "am -sc" on
es/doc-clean-outdated-tools^ and the built-in one takes it just
fine, so we should be OK.

Thanks.