git-node: suggest -x and --autosquash for git rebase#237
Merged
joyeecheung merged 1 commit intonodejs:masterfrom Apr 19, 2018
Merged
git-node: suggest -x and --autosquash for git rebase#237joyeecheung merged 1 commit intonodejs:masterfrom
joyeecheung merged 1 commit intonodejs:masterfrom
Conversation
- Suggest to add `-x "git node land --amend"` which will put `exec git node land --amend` on every picked commit. - Suggest to add `--autosquash` if `fixup!` or `squash!` appears in the commit messages, which will add fixup or squash actions to corresponding commits if they match the autosquash rules.
Member
Author
|
BTW the |
Codecov Report
@@ Coverage Diff @@
## master #237 +/- ##
=======================================
Coverage 88.55% 88.55%
=======================================
Files 19 19
Lines 708 708
=======================================
Hits 627 627
Misses 81 81Continue to review full report at Codecov.
|
targos
approved these changes
Apr 19, 2018
Member
|
Using MitMaro/git-interactive-rebase-tool#62 , I got this result: It's not a problem with Note you can work around this temporarily with something like:
|
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.
-x "git node land --amend"which will putexec git node land --amendon every picked commit.--autosquashiffixup!orsquash!appearsin the commit messages, which will add fixup or squash actions
to corresponding commits if they match the autosquash rules.
Used this to land nodejs/node#20121 . Worked pretty well.