Skip to content

Instantly share code, notes, and snippets.

@matiasherranz
Created October 12, 2017 15:39
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save matiasherranz/88b834838d1cc46d0561316c20a2d3d0 to your computer and use it in GitHub Desktop.
Save matiasherranz/88b834838d1cc46d0561316c20a2d3d0 to your computer and use it in GitHub Desktop.
$ git checkout feature/my-feature
$ git rebase -i master
$ git checkout master
$ git merge --ff-only feature/my-feature
$ git push origin master
$ git branch -d feature/my-feature
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment