fix(rebase): autosquash amend! commits - #92
Open
arumata wants to merge 1 commit into
Open
Conversation
git commit --fixup=amend:<hash> produces an "amend! <subject>" commit that --autosquash turns into "fixup -C": the changes fold into the target like a fixup, but the target is reworded with the amend commit's body. The client autosquash only recognised fixup!/squash!, so amend! commits stayed as pick and their message was never applied (issue the0807#62).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
git commit --fixup=amend:<hash>produces an "amend! " commit that--autosquashturns intofixup -C: changes fold into the target like a fixup, but the target is reworded with the amend commit's body. The client autosquash only recognisedfixup!/squash!, soamend!commits stayed aspickand their message was never applied.\n\nFixes #62.