git rebase

Published June 21st, 2012

How to rebase your changed branch with changes from the branch it came from

git fetch origin

git rebase origin/master

# if you get an error about uncommitted local changes then stash them
git stash

git push origin HEAD:refs/for/master

#if you stashed changes then bring them back
git stash apply

Similar Articles

git clone pass ssh key
Git check incoming changes
Avoiding Dante's 9th Circle of Hell (hint: git branch)
git stash
git delete branch
Git unstage changes (roll back a commit)
git rebase - changes depends on abandoned changes
git fetch changes from remote repository and merge them with your local changes
git revert (reset) a single file
Set up git repository on Debian and push changes from local repository
git reset instead of rebase
Git rename files under version control
git simple checkout, create new branch, add, commit
git list files not under version control