rebase: add --fixup to fold a range into its oldest commit#2323
Open
HaraldNordgren wants to merge 1 commit into
Open
rebase: add --fixup to fold a range into its oldest commit#2323HaraldNordgren wants to merge 1 commit into
HaraldNordgren wants to merge 1 commit into
Conversation
d7a00a5 to
fec8b65
Compare
Folding a series of commits into one required either an interactive
rebase where each commit after the first was hand-edited to "fixup", or
a "git reset --soft" to the merge base followed by "git commit --amend".
Add "git rebase --autosquash --fixup [<upstream>]" to do this directly.
It keeps the oldest commit in the range as a "pick" and turns every
later commit into a "fixup", so the whole range collapses into a single
commit that reuses the oldest commit's message. With no <upstream>
argument the range is "@{upstream}..HEAD", folding all unpushed commits
into one.
Fold the commits in their original order, so that any fixup!/squash!
commits already present in the range are folded in as well. Allow the
flag only together with --autosquash.
Signed-off-by: Harald Nordgren <haraldnordgren@gmail.com>
fec8b65 to
0859468
Compare
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
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.
No description provided.