Skip to content

Instantly share code, notes, and snippets.

@drmmr763

drmmr763/git rebase flow

Created May 11, 2016 14:41
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 drmmr763/a6efe05c25ddc0e84824b5688825d9ec to your computer and use it in GitHub Desktop.
Save drmmr763/a6efe05c25ddc0e84824b5688825d9ec to your computer and use it in GitHub Desktop.
Download ZIP
just making sure I get rebasing
Raw
git rebase flow
"remote"
git branch -v
master
"local"
git branch -v
* master
feature-a
feature-b
git checkout feature-a
git add file.md
git commit -m 'made changes'
# put feature-a onto master-tip
git rebase master
# still have to merge eventually right?
git checkout master
git merge feature-a (# up to date with master via rebase)
git push origin master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment