Skip to content

Instantly share code, notes, and snippets.

@OmgImAlexis
Last active November 13, 2015 03:53
Show Gist options
  • Save OmgImAlexis/8f1e44c091be50255d38 to your computer and use it in GitHub Desktop.
Save OmgImAlexis/8f1e44c091be50255d38 to your computer and use it in GitHub Desktop.
Merge without commit hell
git checkout develop-upstream
git merge --ff-only develop
git push upstream develop-upstream:develop
git checkout develop
git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment