Support fixup with keeping the message of the selected commit#4526
Closed
stefanhaller wants to merge 4 commits into
Closed
Support fixup with keeping the message of the selected commit#4526stefanhaller wants to merge 4 commits into
stefanhaller wants to merge 4 commits into
Conversation
Collaborator
Author
|
This is a draft PR because I'm not convinced about the UI yet, the strings are not i18n'ed, and there are no tests. Also, in an interactive rebase I added a preliminary visualization of which way the fixup goes ( |
Owner
|
Nice, I'll give this branch a go and see how I find it |
stefanhaller
force-pushed
the
fixup-upwards
branch
from
8139eb9 to
ceb940e
Compare
stefanhaller
force-pushed
the
fixup-upwards
branch
from
ceb940e to
05670ab
Compare
This is true for Fixup todos that have their -C flag set.
We show fixup↓ for the normal case where the commit message of the bottom commit is retained, and fixup← for the special case where the message of the upper commit is used (e.g. for 'amend!' commits).
Not used yet, we pass an empty string everywhere, to match the previous behavior. Just extracting this into a separate commit to make the next one smaller.
stefanhaller
force-pushed
the
fixup-upwards
branch
from
05670ab to
335e3bd
Compare
7 tasks
Collaborator
Author
|
Superseded by #5233. |
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
2 participants
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.
@jesseduffield in #4514:
This PR makes this possible by replacing the confirmation with a menu that asks the user which commit message to retain.
Fixes #4514.