From: "R. Diez" <rdiez-2006@rd10•de>
To: Bernd Petrovitsch <bernd@petrovitsch•priv.at>
Cc: git@vger•kernel.org
Subject: Re: Graphical tool to merge and reorder commits
Date: Tue, 19 Aug 2025 13:14:59 +0200 [thread overview]
Message-ID: <f2977c6a-b588-4e30-b7bb-dfa6d4b8b45b@rd10.de> (raw)
In-Reply-To: <260a97ce-2ab0-4920-9cea-078369c42f74@petrovitsch.priv.at>
> - `git rebase -i HEAD~11` (or so;-)
> - move fixA1 and fixA2 under A and change "pick" to "fixup" for fixA1 and fixA2
> - save and exit the editor
I actually did not want to count commits or look at hashes, I wanted to comfortably click around to see the diffs etc. while I make the decisions.
After such posts, I wish people like you had to buy their next online plane or train ticket with curl. }8-)
But let's stay on the command line. I could learn new tricks.
> And done.
OK, git rebase was happy, everything is done.
And now it does not compile anymore.
You'd want to go back to the initial commit sequence and try another approach. But now it's gone, or at least it does not come up anymore in your git-gui. Or is it really gone? Maybe I can dig up the old commit sequence if I find the right Git commands... But that is what I wanted to avoid in the first place!
So I guess I should branch beforehand, just in case. And then move the head back, and rebase the commits there. Or the like. And don't squash yet, just in case. And then squash later, after everything compiles. My keyboard is on fire.
next prev parent reply other threads:[~2025-08-19 11:25 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-17 21:02 Graphical tool to merge and reorder commits R. Diez
2025-08-18 18:04 ` Konstantin Khomoutov
2025-08-18 18:34 ` Junio C Hamano
2025-08-19 8:07 ` Patrick Steinhardt
2025-08-19 8:35 ` R. Diez
2025-08-19 9:51 ` Bernd Petrovitsch
2025-08-19 11:05 ` Patrick Steinhardt
2025-08-19 11:14 ` R. Diez [this message]
2025-08-19 12:08 ` Ben Knoble
2025-08-19 16:33 ` Junio C Hamano
2025-08-19 19:09 ` Johannes Sixt
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=f2977c6a-b588-4e30-b7bb-dfa6d4b8b45b@rd10.de \
--to=rdiez-2006@rd10$(echo .)de \
--cc=bernd@petrovitsch$(echo .)priv.at \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox