Git squash branch

# 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

Source: stackoverflow.com

Similar codes

33 votes192 views6 answers
Kill port mac
Shell/Bash
0 vote168 views1 answer
Start of .sh file
Shell/Bash
0 vote193 views4 answers
How to reset iis
Shell/Bash
0 vote115 views1 answer
Sourcetree permission denied (publickey) github mac
Shell/Bash
0 vote124 views1 answer
Package 'ffmpeg' has no installation candidate ubuntu 18.04
Shell/Bash
2 votes116 views1 answer
Ubuntu check ssh login log
Shell/Bash
0 vote135 views1 answer
Cat first line
Shell/Bash
0 vote118 views1 answer
Make error readline/readline.h
Shell/Bash
-1 vote153 views1 answer
Odoo 14 install ubuntu 20.04
Shell/Bash
21 votes123 views6 answers
Install npm
Shell/Bash