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.

Rev

3

Added in 1.7.12: github.com/git/git/blob/master/Documentation/RelNotes/…
– serbaut
Commented Mar 5, 2013 at 20:45
91

This answer is ok, but if you're interactively rebasing more than, say, 20 commits, the interactive rebase will probably be way too slow and unwieldy. You're probably going to have a hard time trying to squash hundreds or thousands of commits. I would go with a soft or mixed reset to the root commit, then recommit, in that case.
– user456814
Commented Jun 11, 2014 at 2:55
47

If you have many commits it's hard to change 'pick' to 'squash' manually. Use :%s/pick/squash/g in VIM command line to do this faster.
– eilas
Commented Aug 4, 2017 at 14:17
6

this works find, but I had to do a forced push. be careful! git push -f
– philshem
Commented Oct 25, 2019 at 6:42
4

@eilas No need for the g. You only want to replace the first instance of the word pick on each line. Even better is :%s/^pick/squash/.
– user137369
Commented Apr 13, 2023 at 19:05

| 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