Properly squash commits created by git commit --fixup=amend:$rev #27
Conversation
This file contains 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
|
I don't understand that failing DCO check. I didn't add a |
The defined semantic is probably https://developercertificate.org/, as with any other repo using sobs. |
Emantor
approved these changes
Oct 26, 2023
With #28 that has been fixed. Thanks for that. So can you please add your s-o-b? The code looks good, so once this is resolved we can merge. |
git commit --fixup=amend:$rev allows to overwrite the commit message of a previous commit. This results in a commit with prefix "amend!". Expand the pattern that triggers using git rebase -i --autosquash to also match on such commits. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
|
Rebased and added an sob-line |
michaelolbrich
approved these changes
Nov 1, 2023
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.
git commit --fixup=amend:$rev allows to overwrite the commit message of a previous commit. This results in a commit with prefix "amend!". Expand the pattern that triggers using git rebase -i --autosquash to also match on such commits.