Skip to content

Instantly share code, notes, and snippets.

@rogerwalt

rogerwalt/interactiveRebase.md

Created January 30, 2017 07:54
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save rogerwalt/aef228540b715956984e405a8d25f49f to your computer and use it in GitHub Desktop.
Save rogerwalt/aef228540b715956984e405a8d25f49f to your computer and use it in GitHub Desktop.
Download ZIP
Interactive rebase merge
Raw
interactiveRebase.md

on branch feature_interview:

  • $ git checkout develop
  • $ git pull
  • $ git checkout feature_interview
  • $ git checkout -b pr_feature_interview
  • $ git rebase -i develop squash all commits, remain one pick
  • $ git commit --ammend (or use git-cola) to change last commit message
  • $ git push origin and create pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment