From: Josh Triplett <josh@joshtriplett.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] commit: Avoid redundant scissor line with --cleanup=scissors -v
Date: Wed, 28 Feb 2024 20:19:06 -0800 [thread overview]
Message-ID: <ZeAFutaddf4M2wjM@localhost> (raw)
In-Reply-To: <xmqqjzmpu7k6.fsf@gitster.g>
On Tue, Feb 27, 2024 at 09:43:21AM -0800, Junio C Hamano wrote:
> 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.
Sorry about that. I had these two patches in the same branch as my other recent patch
`advice: Add advice.scissors to suppress "do not modify or remove this line"`
but the two ended up independent so I didn't send them as a series. That
patch and this two-patch series should be applicable independently.
If you do end up needing a resend of any of them, I'm happy to do so.
next prev parent reply other threads:[~2024-02-29 4:19 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 4:23 [PATCH] commit: Avoid redundant scissor line with --cleanup=scissors -v Josh Triplett
2024-02-26 18:03 ` Junio C Hamano
2024-02-27 8:32 ` Josh Triplett
2024-02-27 9:16 ` [PATCH v2 1/2] " Josh Triplett
2024-02-27 9:17 ` [PATCH v2 2/2] commit: Unify logic to avoid multiple scissors lines when merging Josh Triplett
2024-02-27 17:43 ` [PATCH v2 1/2] commit: Avoid redundant scissor line with --cleanup=scissors -v Junio C Hamano
2024-02-29 4:19 ` Josh Triplett [this message]
2024-02-29 5:41 ` Junio C Hamano
2024-02-29 6:09 ` Josh Triplett
2024-02-29 16:38 ` Junio C Hamano
2024-02-27 17:10 ` [PATCH] " Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZeAFutaddf4M2wjM@localhost \
--to=josh@joshtriplett.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.