Git Rebase

gistfile1.txt

# Merge a branch B1 in N1 with rebase
git checkout N1
git pull
git checkout B1
git rebase N1
git checkout N1
git rebase B1

# Yet another approach
https://medium.com/@sda/git-rebase-based-workflow-cheat-sheet-3e37ad39da66#.lovwmnkbo
git remote add upstream https://github.com/userOrOrg/repoName.git
git pull upstream master
git checkout -b "awesomeFeature"
git add .
git commit -m "Added an awesome feature"
git pull --rebase upstream master
git rebase --continue
git push origin awesomeFeature
git checkout master
git pull upstream master