From: Jacob Keller <jacob.e.keller@intel.com>
To: Benjamin Tissoires <bentiss@kernel.org>,
Krzysztof Kozlowski <krzk@kernel.org>
Cc: Konrad Dybcio <konrad.dybcio@linaro.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Jiri Kosina <jikos@kernel.org>, <linux-kernel@vger.kernel.org>,
Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Subject: Re: [GIT PULL] HID for 6.11
Date: Tue, 6 Aug 2024 15:04:00 -0700 [thread overview]
Message-ID: <6adde20b-2345-49dd-8502-c2a68c8f1c1e@intel.com> (raw)
In-Reply-To: <3azgpqym2yaceheefnnj54rjjb5vz54haqayxmgbnjvb3rr3sj@aoiwdpfjo65s>
On 7/22/2024 6:51 AM, Benjamin Tissoires wrote:
> Is there anything we can do to rip off that commit from the tree and fix
> b4?
>
>
A bit late, but I just got bit by this comment and i worked around it
using a replace ref:
$ git replace --edit 3a904d2c771115154380caaae7ffaaf0095fb88f
This let me generate a replacement commit with an edited commit message
so that b4 scanning for a commit won't find this particular b4 meta-data.
It is only local (as refs/replace does not generally get shared to
others via normal push/pull) but it worked well for me.
I thought I would share this with other folks as a potential workaround
for their setup. replace refs are special refs which git will
automatically use in place of a regular commit when it finds a matching ref.
https://git-scm.com/docs/git-replace
Thanks,
Jake
next prev parent reply other threads:[~2024-08-06 22:04 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-16 13:34 [GIT PULL] HID for 6.11 Benjamin Tissoires
2024-07-18 0:29 ` Linus Torvalds
2024-07-18 1:27 ` pr-tracker-bot
2024-07-22 12:46 ` Konrad Dybcio
2024-07-22 12:51 ` Krzysztof Kozlowski
2024-07-22 12:56 ` Krzysztof Kozlowski
2024-07-22 13:51 ` Benjamin Tissoires
2024-07-22 13:59 ` Benjamin Tissoires
2024-08-06 22:04 ` Jacob Keller [this message]
2024-07-22 13:32 ` Krzysztof Kozlowski
2024-07-22 13:58 ` Konstantin Ryabitsev
2024-07-22 18:17 ` Konstantin Ryabitsev
2024-07-23 11:26 ` Konrad Dybcio
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=6adde20b-2345-49dd-8502-c2a68c8f1c1e@intel.com \
--to=jacob.e.keller@intel.com \
--cc=bentiss@kernel.org \
--cc=jikos@kernel.org \
--cc=konrad.dybcio@linaro.org \
--cc=konstantin@linuxfoundation.org \
--cc=krzk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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.