git rebase workflow

gistfile1.md

(use git rebase -i)

1. Pull master

---

git checkout master
git fetch origin && git merge master # or, `git pull origin master`

2. Create feature branch

---

git checkout -b awesome-feature

3. Push remote branch

---

git push -u origin awesome-feature 

4. Keep feature branch up to date

---

With master:

git fetch origin
git rebase origin/master

With collaborators:

git rebase origin/awesome-feature

Resolve any conflicts.

6. When done, cleanup & merge

---

Cleanup:

git fetch origin
git rebase origin/master

Merge:

git checkout master
git pull origin master
git merge --no-ff awesome-feature