Notes-on-git.md

Magit squashing http://www.howardism.org/Technical/Emacs/magit-squashing.html

Splitting commits https://stackoverflow.com/questions/1440050/how-to-split-last-commit-into-two-in-git/1440200 https://embeddedartistry.com/blog/2018/2/19/code-cleanup-splitting-up-git-commits-in-the-middle-of-a-branch https://stackoverflow.com/questions/6217156/break-a-previous-commit-into-multiple-commits https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History

Make git forget about a file that was tracked, but is now in gitignore

git rm --cached <file>

Awesome post on undoing things by the github people.

Stash specific file

• StackOverflow
• Interactive thingy git stash -p
• Only in git >= 2.13 git stash push [--] [<pathspec>...]

Move commit to staging area

• StackOverflow
• git reset --soft HEAD^

Push tag

• SO
• To push a single tag: git push origin <tag_name>
• push all tags (not recommended): git push --tags

Force apply stash

• SO
• git checkout stash -- .