git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 2/6] Documentation/config: mention "now" and "never" for 'expire' settings

From
Junio C Hamano <gitster@pobox.com>
Date
Jul 28, 2015, 18:36 UTC
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:
Show 12 quoted lines
> 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.
Previous: Eric SunshineNext: Eric Sunshine
Message 6 of 13 in “minor documentation improvements”
  1. 0/6 minor documentation improvementsEric Sunshine, Jul 24, 2015
  2. 1/6 Documentation/git-worktree: fix broken 'linkgit' invocationEric Sunshine, Jul 24, 2015
  3. 2/6 Documentation/config: mention "now" and "never" for 'expire' settingsEric Sunshine, Jul 24, 2015
  4. Michael HaggertyJul 27, 2015
  5. Eric SunshineJul 28, 2015
  6. Junio C HamanoJul 28, 2015
  7. Eric SunshineJul 28, 2015
  8. 3/6 Documentation/git: drop outdated Cogito referenceEric Sunshine, Jul 24, 2015
  9. 4/6 Documentation/git-tools: improve discoverability of Git wikiEric Sunshine, Jul 24, 2015
  10. 5/6 Documentation/git-tools: fix item text formattingEric Sunshine, Jul 24, 2015
  11. 6/6 Documentation/git-tools: drop references to defunct toolsEric Sunshine, Jul 24, 2015
  12. Junio C HamanoJul 24, 2015
  13. Eric SunshineJul 24, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.