Skip to content

Instantly share code, notes, and snippets.

@C0ZEN
Last active September 14, 2021 21:40
Show Gist options
  • Save C0ZEN/78a27cce8978b7d45b26e1b45f7352b5 to your computer and use it in GitHub Desktop.
Save C0ZEN/78a27cce8978b7d45b26e1b45f7352b5 to your computer and use it in GitHub Desktop.
Rebase fork

Add the remote, call it "upstream":

git remote add upstream https://github.com/whoever/whatever.git

Fetch all the branches of that remote into remote-tracking branches

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment