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 vote170 views2 answers
List installed dotnet versions
Shell/Bash
0 vote166 views1 answer
Brew services start [email protected]
Shell/Bash
1 vote197 views2 answers
A) Write a shell script to list all of the directory files in a directory.
Shell/Bash
1 vote175 views1 answer
Linux test examples
Shell/Bash
0 vote179 views1 answer
How to connect airpods to kali linux
Shell/Bash
0 vote177 views1 answer
Gitlab ci exclude branch
Shell/Bash
8 votes257 views5 answers
Git graph
Shell/Bash
1 vote169 views1 answer
Tar to directory
Shell/Bash
3 votes227 views2 answers
Jest command coverage
Shell/Bash
0 vote199 views1 answer
Imapgrab nodename nor servname provided, or not known
Shell/Bash