Let’s say you want to submit a pull request but you’ve committed more than once and let’s say that also you’re not satisfied with the commit message you originally used. Let’s say you might be feeling like this:
There’s a great post by Steve Klabnik: How to Squash Commits in a github pull request
There were a couple of things that I needed to know in order to follow Klabnik’s helpful post.
First, find out what remotes are set up:
git remote -v.
``` origin firstname.lastname@example.org:youraccount/repo.git (fetch) origin email@example.com:youraccount/repo.git (push) ```
In this case I didn’t have upstream set up.
So, add upstream:
git remote add upstream git@github:projectrepourl.git (You can get this url by navigating to the project’s repo and copying the clone URL.)
Confirm that you’ve added the remote:
git remote -v.
``` origin firstname.lastname@example.org:youraccount/repo.git (fetch) origin email@example.com:youraccount/repo.git (push) upstream git@github:projectrepourl.git (fetch) upstream git@github:projectrepourl.git (push) ```
Note: if you’re not super experienced with git, you might be wondering about ‘origin’, ‘master’, ‘upstream’. Here’s a just little image that hopefully will help:
Now you can follow Klabnik’s post:
``` $ git fetch upstream $ git checkout master $ git rebase -i upstream/master ```
At this stage, you’ll get the opportunity to view the commits you had made previously.
Note: this image is after I had squashed so you only see one commit; but, you can get an idea of what you’d see in vim
squash to the commits that you want to squash. For me, I added an
s to the commit after the first commit. The word
pick prepends the commit info. So delete the word
pick from the second commit and add
s in it’s place. You now get the option to edit the commit message.
Finally, as Klabnik says:
$ git pull origin master -f
If you go back to github, you’ll see that your commits have changed to the squashed number of commits. (For me I squashed two commits to one.)