Breaking News: Grepper is joining You.com. Read the official announcement!

git squash branch

gdfelt answered on April 5, 2021 Popularity 8/10 Helpfulness 4/10

answer git squash branch

git squash branch

Comment

# Assuming you were branching from the master,
# you don't need to enter yourBranch into the reset step all the time:
git checkout yourBranch
git reset --soft HEAD~$(git rev-list --count HEAD ^master)
git add -A
git commit -m "one commit on yourBranch"

# Explanation:

git rev-list --count HEAD ^master counts the commits since you made your feature branch from the master, f.ex. 20.
git reset --soft HEAD~20 will make a soft reset of the last 20 commits. This leaves your changes in the files, but removes the commits.

#Usage:
# In my .bash_profile I have added an alias for gisquash to do this with one command:

# squash all commits into one
alias gisquash='git reset --soft HEAD~$(git rev-list --count HEAD ^master)'
#After reseting and committing you need to do a
git push --force

Popularity 8/10 Helpfulness 4/10 Language shell

Source: stackoverflow.com

Tags: branch git-squash shell

Link to this answer
Share Copy Link

Contributed on Apr 05 2021

gdfelt

0 Answers Avg Quality 2/10

git squash branch

Contents

More Related Answers

git squash branch

Grepper

Documentation

Social

Legal

Contact

Oops, You will need to install Grepper and log-in to perform this action.