Collection of Git command snippets

README.git.md

Collection of Git command snippets

clean.md

git clean -dX --force

filter-repo.md

git filter-repo --invert-paths --path "PATH_TO_FILE_TO_DELETE"

See: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/removing-sensitive-data-from-a-repository#using-git-filter-repo

list-committers.md

List all committers in addition to the author on git log and git show.

git log --pretty=fuller | grep Author: | sort -u
git log --pretty=fuller | grep Commit: | sort -u

merge-repos.md

Allow merging of two Git reoisitories

git remote add -f repo-a [email protected]:someone/repo-a.git
git merge repo-a/main --allow-unrelated-histories

See: https://medium.com/altcampus/how-to-merge-two-or-multiple-git-repositories-into-one-9f8a5209913f

pr-diff.md

Check if PR includes changes in a specific directory

git switch $PR_BRANCH
git diff upstream/main HEAD -- $DIR_TO_COMPARE

rebase-ignore-whitespace.md

git rebase --ignore-whitespace main

Ref: https://stackoverflow.com/a/63751527

replace-committers.md

Commands to replace all the committer emails in the commit logs

echo -e "Jumpei Ogawa <[email protected]> <[email protected]>\nJumpei Ogawa <[email protected]> <[email protected]>" | tee ./mailmap

git filter-repo --mailmap mailmap

show-committers.md

git log --pretty=fuller
git show COMMIT__HASH --pretty=fuller

See: https://stackoverflow.com/a/26365741/1006850