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 vote217 views2 answers
Linux apps
Shell/Bash
5 votes194 views2 answers
Current date bash
Shell/Bash
1 vote204 views1 answer
Install existing laravel project in xampp
Shell/Bash
0 vote248 views1 answer
Bash tar list of files from folder
Shell/Bash
0 vote201 views1 answer
Module Error (from ./node_modules/sass-loader/dist/cjs.js): Node Sass version 6.0.0 is incompatible with ^4.0.0 || ^5.0.0.
Shell/Bash
0 vote200 views1 answer
Npm compile sass to css
Shell/Bash
10 votes182 views2 answers
Uninstall packages linux terminal
Shell/Bash
0 vote206 views1 answer
Powershell disk space
Shell/Bash
0 vote292 views1 answer
Kali - How to Uninstall Software on Kali Linux
Shell/Bash
0 vote194 views1 answer
Force add despite the .gitignore file
Shell/Bash