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

0 vote144 views1 answer
Scroll terminal keyboard
Shell/Bash
2 votes133 views4 answers
Auth install laravel 8
Shell/Bash
1 vote156 views1 answer
QNAP NAS crontab reset
Shell/Bash
0 vote132 views2 answers
Integrity check failed: java.security.NoSuchAlgorithmException: Algorithm HmacPBESHA256 not available
Shell/Bash
0 vote206 views1 answer
Jetson nano arch linux for yolo
Shell/Bash
0 vote151 views1 answer
Remote root directory jenkins centos
Shell/Bash
1 vote183 views1 answer
Ubunutu stats top menu bar
Shell/Bash
0 vote146 views1 answer
Does among us exist for linux
Shell/Bash
4 votes139 views3 answers
How to brew install mongodb
Shell/Bash
0 vote176 views1 answer
Git commit -am "make it better" error
Shell/Bash