Squash all my commits into one for GitHub pull request

Question

I made a pull request on GitHub. Now the owner of the repository is saying to squash all the commits into one.

When I type git rebase -i Notepad opens with the following content:

noop

# Rebase 0b13622..0b13622 onto 0b13622
#
# Commands:
#  p, pick = use commit
#  r, reword = use commit, but edit the commit message
#  e, edit = use commit, but stop for amending
#  s, squash = use commit, but meld into previous commit
#  f, fixup = like "squash", but discard this commit's log message
#  x, exec = run command (the rest of the line) using shell
#
# These lines can be re-ordered; they are executed from top to bottom.
#
# If you remove a line here THAT COMMIT WILL BE LOST.
#
# However, if you remove everything, the rebase will be aborted.
#
# Note that empty commits are commented out

I searched on Google but I do not understand how to do this.

Duplicate of [Squash my last X commits together using Git](http://stackoverflow.com/q/5189560/456814). — , Jun 06 '14 at 08:13
You don't have to squash anymore: the owner can do it for you (since March 2016): see http://stackoverflow.com/a/36377439/6309 — VonC, Apr 02 '16 at 18:52

score 88 · Accepted Answer · answered May 20 '13 at 04:29

88

Just a simple addition to help someone else looking for this solution. You can pass in the number of previous commits you would like to squash. for example,

git rebase -i HEAD~3

This will bring up the last 3 commits in the editor.

answered May 20 '13 at 04:29

fontno

6,642
6
36
43

11

Doing `git rebase -i HEAD~2` for me brings up an editor with like 20 lines of commits. And none of them are the last two commits I want. What's going on? – B T Jun 26 '15 at 17:57
3

Probably your previous commit is a merge. – Kamil Sarna Oct 29 '15 at 13:57
See also @omerjerk's answer below about editing the last 2 commits from pick to squash – frankster Jul 25 '16 at 10:34
4

this isn't useful if you've merged in a branch like master that has more recent updates – Jake Sylvestre Aug 29 '20 at 14:24

omerjerk · Answer 2 · 2014-11-29T09:49:45.637

51

ok I figured it out ... First I had to write git rebase -i xxxxxxxxxxxxxxxx where xxxxxxxxxx is the SHA of the commit upto which I've to squash. Then in Notepad I edited the first as pick and rest of all as squash. Then a new notepad window will come and there in the first line I typed the name of my new commit. And then I had to do a force push :

git push --force origin master

edited Nov 29 '14 at 09:49

answered Jan 26 '13 at 08:25

omerjerk

4,090
5
40
57

7

It's not a good idea to force push or rebase a branch that is already pushed to remote. All other people who had the un-rebased master branch will get an error, and they will be confused. – luckykrrish Oct 16 '14 at 10:45
4

what does "up to" mean exactly? Is xxxxxxxxxxx included or not included? – sebnukem Mar 19 '15 at 17:10
4

@luckykrrish How does one squash commits on a public pull request then? – Justin Skiles Dec 03 '15 at 12:58
3

@luckykrrish That's a perfectly acceptable thing to do on your own PR branch. – Léo Lam Dec 26 '15 at 20:45
1

I got conflict. Thank you very much for this. No one mentions about this in no other answer. – Barlas Apaydin Sep 17 '20 at 16:56
it is better to use `--force-with-lease` – banderlog013 Mar 24 '21 at 19:49

Stevoisiak · Answer 3 · 2019-04-03T20:53:48.420

37

As of April 1, 2016, the repository's manager can squash all the commits in a pull request into a single commit by selecting "Squash and merge" on a pull request.

If you want to manually squash commits in a pull request, refer to fontno's answer.

edited Apr 03 '19 at 20:53

answered May 08 '17 at 23:25

Stevoisiak

23,794
27
122
225

Cong Wang · Answer 4 · 2013-01-26T06:20:40.617

11

Try git rebase -i, and use 'squash' for all the commits you want to squash.

Edit:

git rebase -i will show you an interactive editor with the list of commits you are rebasing. The default command before each commit is "pick", so you just need to s/pick/squash/ for all the commits you want to squash, and then all of them will be squash into their last previous commit.

Make sure you are rebasing on a correct branch.

edited Jan 26 '13 at 06:20

answered Jan 26 '13 at 06:13

Cong Wang

2,001
12
13

6

I didn't get it.. I already said I know nothing of these things. – omerjerk Jan 26 '13 at 06:16
`git rebase -i` will show you an interactive editor with the list of commits you are rebasing. The default command before each commit is "pick", so you just need to s/pick/squash/ for all the commits you want to squash. – Cong Wang Jan 26 '13 at 06:20
`git rebase -i` is followed by a branch name, make sure you have read the last sentence in my answer. – Cong Wang Jan 26 '13 at 07:06
ok I got it. and squashed all the changes into a new commit . but when clicked on sync then those commits again came. should i do something else after squashing ? – omerjerk Jan 26 '13 at 07:26
2

when you write "s/pick/squash/", what is the "s" option? – AlanSE Aug 27 '15 at 13:57
"s/pick/squash" means "replace pick with squash". – Léo Lam Dec 26 '15 at 20:46
3

It's `sed` syntax (Stream EDitor), a very powerful but arcane Linux tool. The `s` command stands for "switch" (or replace), followed by a search string and a replacement string, separated by slashes. Usually followed by "g", which means "global", or "do this replacement not just once but everywhere". So `s/pick/squash/g` means: "replace every instance of `pick` with `squash`". – Amedee Van Gasse Sep 15 '16 at 08:40
This is a very helpful answer! Thanks! – Fisher Coder Jan 15 '17 at 20:50
It's a great discussion but it does not answer the question what one should actually do. `error: invalid line 3: s/pick/squash/g` does not seem to be a successful execution – Anna Leonenko Aug 05 '22 at 20:05
This is pathologically wrong with git – Niklas Rosencrantz Jun 14 '23 at 04:54

Squash all my commits into one for GitHub pull request

4 Answers4

Linked

Related