From: Junio C Hamano <gitster@pobox.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Michael Haggerty <mhagger@alum.mit.edu>,
Git List <git@vger.kernel.org>, Paul Tan <pyokagan@gmail.com>
Subject: Re: [PATCH 2/6] Documentation/config: mention "now" and "never" for 'expire' settings
Date: Tue, 28 Jul 2015 11:36:57 -0700 [thread overview]
Message-ID: <xmqqzj2gdt86.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <CAPig+cTbTi5Uj_BFWBQ+rDc0=PhY1pu9Emr9TwTwPzGCeE5J2A@mail.gmail.com> (Eric Sunshine's message of "Tue, 28 Jul 2015 13:33:53 -0400")
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.
next prev parent reply other threads:[~2015-07-28 18:37 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 4:00 [PATCH 0/6] minor documentation improvements Eric Sunshine
2015-07-24 4:00 ` [PATCH 1/6] Documentation/git-worktree: fix broken 'linkgit' invocation Eric Sunshine
2015-07-24 4:00 ` [PATCH 2/6] Documentation/config: mention "now" and "never" for 'expire' settings Eric Sunshine
2015-07-27 1:41 ` Michael Haggerty
2015-07-28 17:33 ` Eric Sunshine
2015-07-28 18:36 ` Junio C Hamano [this message]
2015-07-28 20:33 ` Eric Sunshine
2015-07-24 4:00 ` [PATCH 3/6] Documentation/git: drop outdated Cogito reference Eric Sunshine
2015-07-24 4:00 ` [PATCH 4/6] Documentation/git-tools: improve discoverability of Git wiki Eric Sunshine
2015-07-24 4:00 ` [PATCH 5/6] Documentation/git-tools: fix item text formatting Eric Sunshine
2015-07-24 4:00 ` [PATCH 6/6] Documentation/git-tools: drop references to defunct tools Eric Sunshine
2015-07-24 18:03 ` Junio C Hamano
2015-07-24 21:34 ` Eric Sunshine
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqzj2gdt86.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=pyokagan@gmail.com \
--cc=sunshine@sunshineco.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).