Skip to content

Instantly share code, notes, and snippets.

@binaerbaum
Created May 22, 2016 13:36
Show Gist options
  • Save binaerbaum/0060a6c430f6ab9de59c4063b786de0c to your computer and use it in GitHub Desktop.
Save binaerbaum/0060a6c430f6ab9de59c4063b786de0c to your computer and use it in GitHub Desktop.
#Like hg pull. Pulls all branches
git fetch <remote> (e.g. git fetch origin)
#Then to see what has been pulled (between my local master and the origin/master)
git log --oneline master..origin/master
#If not on master branch, switch to it
git checkout master
#Then merge the changes (like hg up)
git merge origin/master
#Or simply
git pull <remote>
#Or to rebase
git pull --rebase <remote>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment