Option to squash when merging branch

145 votes

When merging a feature branch that has multiple commits against it back into main, it would be nice to have the option of squashing the commits during the merge.

Under consideration Suggested by: Stephen Oakman (18 Jun, '21) • Upvoted: 12 Apr • Comments: 10

Comments: 10

24 Feb, '22
Coffee
I was actually expecting this to be honest, can't believe it is not a thing.
Now my main branch looks a bit of a mess and the squash option wasn't available after the merge,
1
03 Mar, '22
Marco Mansi
This should be a must have
25 Apr, '22
Marcin
+1 for this feature
22 Oct, '22
Marcella
+1 for this feature from me too.
13 Nov, '22
Revyn112
+1 missing this the most currently
14 Feb, '23
Raul Alex Ratiu
+1 from my side it should be a must to have this as a feature
16 Feb, '23
Oranges
Yes please!
29 Mar, '23
Lorenzo
+1 for this feature from me too.
10 Nov, '23
Ben Stanley
Anyone who really likes this feature has never used git bisect to determine the root cause of a regression. You're missing out on a powerful technique.
Git bisect works best if you use small commits, and rebase your branches before merging to keep a linear tree.
This article provides a comprehensive description of git bisect and using git to support this workflow.
https://codingitwrong.com/2021/09/08/small-commits-and-the-power-of-git-bisect.html
This comment is NOT a vote for squashing commits before merging.
07 Feb
David
+1 vote FOR this feature. It should be an option, since many of us do it all the time.

There should also be an option for squashing after the merge already happened (as Coffee mentioned), though that's slightly different than the OP request.

The power of git bisect is irrelevant. By that logic, we shouldn't have a squash option at all.