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

4 votes159 views2 answers
Git show unpushed commits
Shell/Bash
0 vote161 views1 answer
Stop mark from showing nano
Shell/Bash
0 vote167 views2 answers
Adding in ssh agent
Shell/Bash
0 vote164 views1 answer
Kubernetes get statefulset
Shell/Bash
7 votes175 views3 answers
Instalar docker compose ubuntu
Shell/Bash
0 vote151 views1 answer
Make only one digit input box
Shell/Bash
0 vote151 views1 answer
Pipe find to rm
Shell/Bash
1 vote151 views1 answer
Git name repository
Shell/Bash
3 votes176 views2 answers
Adb install apk
Shell/Bash
2 votes149 views1 answer
Snapd version
Shell/Bash