Skip to content

Instantly share code, notes, and snippets.

@longtimeago

longtimeago/squash-commits.md

Last active April 1, 2024 20:44
Show Gist options
  • Save longtimeago/f7055aa4c3bba8a62197 to your computer and use it in GitHub Desktop.
Save longtimeago/f7055aa4c3bba8a62197 to your computer and use it in GitHub Desktop.
Download ZIP

Revisions

  1. longtimeago revised this gist Mar 27, 2016. 1 changed file with 1 addition and 1 deletion.
    2 changes: 1 addition & 1 deletion squash-commits.md
    View file
    Original file line number Diff line number Diff line change
    @@ -1,4 +1,4 @@
    How to squash commits in a GitHub pull request
    ## How to squash commits in a GitHub pull request

    o you've contributed some code to an open source project, say, Rails.
    And they'd like you to squash all of the commits in your pull request.
  2. longtimeago created this gist Mar 27, 2016.
    21 changes: 21 additions & 0 deletions squash-commits.md
    View file
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,21 @@
    How to squash commits in a GitHub pull request

    o you've contributed some code to an open source project, say, Rails.
    And they'd like you to squash all of the commits in your pull request.
    But you're not a git wizard; how do you make this happen?

    Normally, you'd do something like this.
    I'm assuming upstream is a git remote that is pointing at the official project repository,
    and that your changes are in your 'omgpull' branch:

    ```
    $ git fetch upstream
    $ git checkout omgpull
    $ git rebase -i upstream/master
    < choose squash for all of your commits, except the first one >
    < Edit the commit message to make sense, and describe all your changes >
    $ git push origin omgpull -f
    ```