Skip to content

Instantly share code, notes, and snippets.

@begin29

begin29/git-rebase.sh

Created November 26, 2015 12:07
Show Gist options
  • Save begin29/574da79dc2c81cf465ae to your computer and use it in GitHub Desktop.
Save begin29/574da79dc2c81cf465ae to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-rebase.sh
#Alternate to merge
git checkout feature
git rebase master
#Smash last 2 commits
git rebase -i HEAD~2
#Conflicts?
#resolve conflicts
git add (conflict files)
git rebase --continue
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment