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 vote152 views1 answer
Install pug angular
Shell/Bash
1 vote145 views1 answer
NotImplementedError: OpenSSH keys only supported if ED25519 is available net-ssh requires the following gems for ed25519 suppor
Shell/Bash
0 vote154 views1 answer
Ubuntu wifi drivers
Shell/Bash
5 votes159 views1 answer
Ssh restart ubuntu
Shell/Bash
6 votes150 views2 answers
Starting Apache...fail.
Shell/Bash
0 vote148 views1 answer
Piping commands 1
Shell/Bash
1 vote175 views2 answers
Please install all available updates for your release
Shell/Bash
0 vote165 views1 answer
Uvicorn ERROR: [Errno 98] Address already in use
Shell/Bash
1 vote153 views1 answer
The authenticity of host gitlab can't be established
Shell/Bash
0 vote138 views1 answer
Open image from terminal in ubuntu 18
Shell/Bash