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 vote194 views1 answer
Install rabbitmq docker image
Shell/Bash
1 vote185 views1 answer
./node_modules/@material-ui/styled-engine/index.js Module not found: Can't resolve '@emotion/styled'
Shell/Bash
0 vote183 views1 answer
Python rioxarray install
Shell/Bash
0 vote177 views1 answer
Conda install cffi
Shell/Bash
0 vote188 views1 answer
Conda pydot
Shell/Bash
10 votes219 views6 answers
Listen EADDRINUSE: address already in use :::8081
Shell/Bash
0 vote191 views2 answers
Android studio licenses
Shell/Bash
0 vote212 views1 answer
Linux encrypt pdf
Shell/Bash
1 vote195 views1 answer
Apply gitignore to current commit
Shell/Bash
0 vote186 views1 answer
LibSDL2_net-2.0.so.0 install on ubuntu
Shell/Bash