Edit - Stack Overflow

You are not logged in. Your edit will be placed in a queue until it is peer reviewed.

We welcome edits that make the post easier to understand and more valuable for readers. Because community members review edits, please try to make the post substantially better than how you found it, for example, by fixing grammar or adding additional resources and hyperlinks.

Required fields*

Rev

Required fields*

How do I squash my last N commits together?

How do I squash my last N commits together into one commit?

Answer*

Based on [Chris Johnsen's answer](https://stackoverflow.com/a/5201642/1580288),


Add a global "squash" alias from bash: (or Git Bash on Windows)


    git config --global alias.squash '!f(){ git reset --soft HEAD~${1} && git commit --edit -m"$(git log --format=%B --reverse HEAD..HEAD@{1})"; };f'

... or using Windows' Command Prompt:


    git config --global alias.squash "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f"

<br>
Your `~/.gitconfig` should now contain this alias:

    [alias]
	    squash = "!f(){ git reset --soft HEAD~${1} && git commit --edit -m\"$(git log --format=%B --reverse HEAD..HEAD@{1})\"; };f"

<br>
Usage:

    git squash N
... Which automatically squashes together the last `N` commits, inclusive.

Note: The resultant commit message is a combination of all the squashed commits, in order. If you are unhappy with that, you can always `git commit --amend` to modify it manually. (Or, edit the alias to match your tastes.)

Edit Summary*

Cancel

7

Interesting, but I'd much rather type the squashed commit message myself, as a descriptive summary of my multiple commits, than have it auto-entered for me. So I'd rather specify git squash -m "New summary." and have N determined automatically as the number of unpushed commits.

Asclepius
– Asclepius

2014-04-22 18:50:40 +00:00
Commented Apr 22, 2014 at 18:50
2

@A-B-B, This sounds like a separate question. (I don't think it's exactly what the OP was asking; I've never felt a need for it in my git squash workflow.)

EthanB
– EthanB

2014-04-23 22:29:20 +00:00
Commented Apr 23, 2014 at 22:29
4

This is pretty sweet. Personally I'd like a version that uses the commit message from the first of the squashed-together commits. Would be good for things like whitespace tweaks.

funroll
– funroll

2014-07-10 01:40:14 +00:00
Commented Jul 10, 2014 at 1:40
@funroll Agreed. Just dropping the last commit msg is a super common need for me. We should be able to devise that...

Steve Clay
– Steve Clay

2014-09-26 15:52:34 +00:00
Commented Sep 26, 2014 at 15:52
4

@A-B-B you can use git commit --amend to further change the message, but this alias lets you have a good start on what should be in the commit message.

dashesy
– dashesy

2016-07-14 15:59:43 +00:00
Commented Jul 14, 2016 at 15:59

| Show 7 more comments

Correct minor typos or mistakes
Clarify meaning without changing it
Add related resources or links
Always respect the author’s intent
Don’t use edits to reply to the author

create code fences with backticks ` or tildes ~
```
like so
```
add language identifier to highlight code
```python
def function(foo):
print(foo)
```
put returns between paragraphs
for linebreak add 2 spaces at end
_italic_ or **bold**
indent code by 4 spaces
backtick escapes `like _so_`
quote by placing > at start of line
to make links (use https whenever possible)

<https://example.com>

[example](https://example.com)

<a href="https://example.com">example</a>

formatting help »
answering help »

Collectives™ on Stack Overflow

How do I squash my last N commits together?

Answer*