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

Re: [PATCH 3/4] Fix misuses of "nor" in comments

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 21, 2014, 17:58 UTC
Message-ID
<xmqqzjkjtown.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CAMuNMfov+Z0Hx_a-hZ2ZGRdkTtw1eqUn01gWEQ+caT3VcHZkVQ@mail.gmail.com>
Justin Lebar <jlebar@google.com> writes:
> Thanks for the quick reply.
>
> When I send a new patch, should I fold these changes into the original
> commit, or should I send them as a separate commit?

While a patch is still in an early discussion stage, consider their earlier incarnation rejected and send them afresh with [PATCH v2] (or v3, v4,...) when rerolling.

When you do this kind of tree-wide clean-up, please make sure that your patch applies cleanly to 'maint', 'master', 'next' and 'pu' branches, to check if you are touching some area that are undergoing other changes. If you find conflicts, please remove overlapping parts from your main patch, make the removed parts into separate patches that can be applied on top once these other topics that are in flight are ready to be merged.

Thanks.
Previous: Junio C HamanoNext: Jason St. John
Message 8 of 11 in “Fix misuses of "nor" (v2)”
  1. 0/4 Fix misuses of "nor" (v2)Justin Lebar, Mar 20, 2014
  2. 1/4 Documentation: Fix misuses of "nor"Justin Lebar, Mar 20, 2014
  3. 2/4 contrib: Fix misuses of "nor"Justin Lebar, Mar 20, 2014
  4. 3/4 Fix misuses of "nor" in commentsJustin Lebar, Mar 20, 2014
  5. Jason St. JohnMar 20, 2014
  6. Justin LebarMar 20, 2014
  7. Junio C HamanoMar 21, 2014
  8. Junio C HamanoMar 21, 2014
  9. Jason St. JohnMar 22, 2014
  10. Justin LebarMar 29, 2014
  11. 4/4 Fix misuses of "nor" outside comments and in testsJustin Lebar, Mar 20, 2014

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.