From: Junio C Hamano <gitster@pobox.com>
To: "Nude F. Ninja" <nudefninja@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: :/regex syntax picks stash entries over regular commits
Date: Sun, 31 Mar 2024 16:06:35 -0700 [thread overview]
Message-ID: <xmqqy19ydmro.fsf@gitster.g> (raw)
In-Reply-To: <CAOSCdbFg8jY1_0JE0+xf8oxrJjx-Kj0Cb0pPg3oUAXMN5q=kzw@mail.gmail.com> (Nude F. Ninja's message of "Sun, 31 Mar 2024 23:13:03 +0100")
"Nude F. Ninja" <nudefninja@gmail.com> writes:
> What did you do before the bug happened? (Steps to reproduce your issue)
> I ran git stash push, which created the stash entry "On main: dark
> mode". Then I committed changes before noticing an oversight with the
> previous commit. I wrote the fix and ran git commit --fixup :/dark
It is natural that there are multiple commits that match the pattern
you give in your repository.
One trick I learned that is effective is to explicitly state where
to start searches, e.g. "--fixup 'HEAD^{/dark mode}'", which would
be very much in line to what --fixup wants to do. The commit to be
fixed up in a later rebase session by definition must be an ancestor
of the current HEAD.
next prev parent reply other threads:[~2024-03-31 23:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-31 22:13 :/regex syntax picks stash entries over regular commits Nude F. Ninja
2024-03-31 23:06 ` Junio C Hamano [this message]
2024-04-01 2:44 ` Jeff King
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqy19ydmro.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=nudefninja@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).