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

Re: [PATCH v2 1/2] commit: Avoid redundant scissor line with --cleanup=scissors -v

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 27, 2024, 17:43 UTC
Message-ID
<xmqqjzmpu7k6.fsf@gitster.g>
In-Reply-To
<4f97933f173220544a5be2bf05c2bee2b044d2b1.1709024540.git.josh@joshtriplett.org>
Josh Triplett <josh@joshtriplett.org> writes:
> diff --git a/wt-status.c b/wt-status.c
> index ea13f5d8db..2d576f7a44 100644

I do not seem to have the preimage ea13f5d8db; as a bugfix patch, it would be preferrable to make the patches not to depend on anything in flight. If feasible, it may even be nicer to base them on one of the maintenance tracks.

I managed to wiggle the patch in (somehow a context line was misindented), so there hopefully is no need to resend.

Thanks.
Previous: Josh TriplettNext: Josh Triplett
Message 6 of 11 in “commit: Avoid redundant scissor line with --cleanup=scissors -v”
  1. commit: Avoid redundant scissor line with --cleanup=scissors -vJosh Triplett, Feb 26, 2024
  2. Junio C HamanoFeb 26, 2024
  3. Josh TriplettFeb 27, 2024
  4. 1/2 commit: Avoid redundant scissor line with --cleanup=scissors -vJosh Triplett, Feb 27, 2024
  5. 2/2 commit: Unify logic to avoid multiple scissors lines when mergingJosh Triplett, Feb 27, 2024
  6. Junio C HamanoFeb 27, 2024
  7. Josh TriplettFeb 29, 2024
  8. Junio C HamanoFeb 29, 2024
  9. Josh TriplettFeb 29, 2024
  10. Junio C HamanoFeb 29, 2024
  11. Junio C HamanoFeb 27, 2024

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.