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

3 votes309 views1 answer
Linux get docker compose logs
Shell/Bash
1 vote320 views1 answer
Docker how to run command in mysql
Shell/Bash
0 vote298 views1 answer
Boost volume in ubuntu 18.04
Shell/Bash
3 votes295 views6 answers
Git local branch track remote
Shell/Bash
0 vote302 views1 answer
Ubuntu sites available location?
Shell/Bash
0 vote320 views1 answer
He user limit on the total number of inotify watches was reached; increase the fs.inotify.max_user_watches sysctl\n'
Shell/Bash
1 vote298 views1 answer
Run google chrome from terminal
Shell/Bash
0 vote262 views2 answers
Git reset commiter credentials
Shell/Bash
0 vote312 views1 answer
What is the ssh credentials for minikube
Shell/Bash
1 vote300 views3 answers
Docker redis
Shell/Bash