Skip to content

Instantly share code, notes, and snippets.

@dm
Created June 28, 2016 12:47
Show Gist options
  • Select an option

  • Save dm/f3d01077ea3fd241befe49079c53b2e2 to your computer and use it in GitHub Desktop.

Select an option

Save dm/f3d01077ea3fd241befe49079c53b2e2 to your computer and use it in GitHub Desktop.
Github expected Squash+Merge behaviour
git checkout PR-Branch
git reset --soft HEAD~10 # i.e. PR with 10 commits
git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"
git checkout master
git merge --no-ff PR-Branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment