Last active
August 18, 2017 23:54
-
-
Save mLuby/d61284646694b2364611cee8aa5479aa to your computer and use it in GitHub Desktop.
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
| git hist master.. | |
| # last commit is abc1234 | |
| # -Xtheirs resolves merge conflicts in favor of them (current branch) | |
| git rebase -i abc1234^ -Xtheirs | |
| # in vim: | |
| # cwr[escape] | |
| # :%s/^pick /squash /gc[enter] | |
| # :wq[enter] | |
| # Also worth noting to get a single commit with diff between | |
| git reset --soft abc1234^ | |
| git commit |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment