Git Cheatsheet




Flow if I’m the only one working on the branch

The normal flow if I need to rebase a development branch.

# Pull the latest from origin
$ git checkout develop

$ git pull

$ git checkout [my-branch]

# Do the interactive rebase
$ git rebase -i develop

# Overwrite the branch on origin
$ git push -f origin

Update Forked Repo

# Add the remote, call it "upstream":

git remote add upstream

# Fetch all the branches of that remote into remote-tracking branches,
# such as upstream/master:

git fetch upstream

# Make sure that you're on your master branch:

git checkout master

# Rewrite your master branch so that any commits of yours that
# aren't already in upstream/master are replayed on top of that
# other branch:

git rebase upstream/master

Squash all commits

git rebase --root -i

blog comments powered by Disqus