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

20 votes201 views5 answers
Yarn remove package
Shell/Bash
0 vote220 views2 answers
Build-essential ubuntu install
Shell/Bash
0 vote227 views1 answer
How to ushow to add hadolint as a pre-commit hook
Shell/Bash
0 vote198 views1 answer
Rosetta terminal icon
Shell/Bash
0 vote202 views1 answer
Pip install ignore errors
Shell/Bash
5 votes227 views1 answer
Bash run multiple commands
Shell/Bash
0 vote169 views2 answers
How to run nessus in kali
Shell/Bash
3 votes206 views1 answer
See total space available in shell
Shell/Bash
9 votes213 views3 answers
Pip not found after installation
Shell/Bash
0 vote206 views1 answer
Adding local user to Docker group
Shell/Bash