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

Re: [PATCH v2] pull: introduce a pull.rebase option to enable --rebase

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 7, 2011, 16:44 UTC
Message-ID
<7v39dz3ms7.fsf@alter.siamese.dyndns.org>
In-Reply-To
<CACBZZX5Lq7vunx-QnsrufQVWJ6xYPoMXnv+tMwhOC3XbrZO11A@mail.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 9 quoted lines
> On Sun, Nov 6, 2011 at 20:53, Johannes Sixt <j6t@kdbg.org> wrote:
>> When you continue an indented item in a separate paragraph, then you
>> must not use an empty line, but have line with '+' and un-indented
>> continuation paragraphs. See examples in this file.
>
> Thanks for spotting that.
>
> Junio: Should I spam you with another patch or is something you'd
> prefer to just fix up?

It is about the same amount of work for me; I've just dedented the two paragraphs that start with "*NOTE*:" and replaced the blank lines before them with a single "+". Is that what you wanted to resend, or is there anything else?

Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 9 of 10 in “pull: introduce a pull.rebase option to enable --rebase”
  1. pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason, Nov 5, 2011
  2. Johannes SchindelinNov 5, 2011
  3. Junio C HamanoNov 6, 2011
  4. Sverre RabbelierNov 6, 2011
  5. pull: introduce a pull.rebase option to enable --rebaseÆvar Arnfjörð Bjarmason, Nov 6, 2011
  6. Junio C HamanoNov 6, 2011
  7. Johannes SixtNov 6, 2011
  8. Ævar Arnfjörð BjarmasonNov 7, 2011
  9. Junio C HamanoNov 7, 2011
  10. Ævar Arnfjörð BjarmasonNov 7, 2011

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.