nfx/git.md

Last active November 24, 2023 11:28

Star () You must be signed in to star a gist
Fork () You must be signed in to fork a gist

Learn more about clone URLs
Clone this repository at <script src="https://gist.github.com/nfx/04eac94612dc85648e83652e6ecbaf54.js"></script>
Save nfx/04eac94612dc85648e83652e6ecbaf54 to your computer and use it in GitHub Desktop.

Download ZIP

git commands

Raw

git.md

Some commands are repeated so often, but one may forget the exact syntax

Squash all commits on branch

From this stackoverflow comment:

git reset $(git merge-base $(git config --get init.defaultBranch || echo main) $(git branch --show-current)) && git add -A && git commit

Squash and rebase

git reset $(git merge-base $(git config --get init.defaultBranch || echo main) $(git branch --show-current)) && git add -A && git commit && git fetch && git rebase origin/$(git config --get init.defaultBranch || echo main) -i

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment