Most efficient command to squash git commands

veryangryman · 2021-11-23 18:49:05

Bonus points for readability. So each pull request, we have a shedload of commits. Id like to just have 1 overall commit with the difference between HEAD and this I'm aware of commit --amend but this isn't an option (long story). Any idears?

23-11-2021 06:49PM

#1

veryangryman

Registered Users, Registered Users 2 Posts: 5,804 ✭✭✭

Join Date: November 2007

Posts: 4790

Bonus points for readability.

So each pull request, we have a shedload of commits. Id like to just have 1 overall commit with the difference between HEAD and this

I'm aware of commit --amend but this isn't an option (long story). Any idears?

0

Comments

#2 23-11-2021 07:56PM

Colonel Panic

Registered Users, Registered Users 2 Posts: 2,065 ✭✭✭

Join Date: August 2011

Posts: 2031

Can’t you just view the diff of all commits?
Anyway, you could soft reset the last N commits and then add and commit all the changes.
Or interactive rebase let’s you do something similar.
Problem is, this rewrites history so only really do this locally.

0
#3 24-11-2021 11:38AM

lynchie

Registered Users, Registered Users 2, Paid Member Posts: 2,033 ✭✭✭

Join Date: November 2001

Posts: 1914

If all commits for a pull request are on a branch e.g. bugfix/abc or feature/abc then you can do a git merge -squash onto master which will create one commit? Bitbucket has that feature when merging pull requests and I assume GitHub and gitlab have similar?

0