-
-
Notifications
You must be signed in to change notification settings - Fork 89
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git rebase -i "fixup" strands a bunch of commits after squashing #1088
Comments
I also have been running into this issue. The closest discussion I've found on this is here but the solution listed therein ( |
I've been doing more experimenting with this. I think the problem is changing 1 commit vs changing multiple commits. Things that worked with interactive rebase:
Problems:
|
Thanks for reporting. If I recall correctly, this has been an outstanding (but untracked) bug since the first versions of git-branchless. The commits are marked live by the |
It's worth noting that, after the fact, you could probably hide the fixup commits with an invocation something like |
@cshinaver Stealing your work :) Let me know if you want it back. |
Description of the bug
I saw on the wiki that interactive rebase is fully supported, but when I "fixup"'d multiple commits with
git rebase -i
, all the interim commits were rewritten and stranded. Thesmartlog
shows all of these commits as separate branches with useless commit messages.Expected behavior
I expected the fixup commits to be hidden from the smartlog and only the remaining rewritten commit to be present.
Actual behavior
No response
Version of
rustc
No response
Automated bug report
No response
Version of
git-branchless
git-branchless-opts 0.8.0
Version of
git
git version 2.37.1 (Apple Git-137.1)
The text was updated successfully, but these errors were encountered: