Git Cheatsheet

Remove files that have been added to the .gitignore

git rm -r --cached .
git add .

Update a Fork

To merge the fork origin upstream in the current repo

git fetch upstream
git checkout master
git merge upstream/master

Setup upstream

fatal: upstream does not appear to be a git repository

git remote -v
git remote add upstream https://github.com/[user]/[rep]

Then rerun the commands above

Undo all local changes

git reset --hard
git clean -fd

Delete branch locally and remote

git branch -d [branch_name] # delete locally
git push origin --delete [branch_name] # delete remote

Delete all local branches (clean up)

git checkout master
git branch --merged | grep -v \* | xargs git branch -D 

This will delete all local branches that are listed via git branch --merged

Merge single commits

git cherry-pick [commit]

Contributers

Commits per month

git log --date=format:"%Y-%m" --format="%ad" | sort | uniq -c | awk '{print $2, $1}'

Get the commits per contibutors per month

git log --pretty="%ad %an" --date=format:"%Y-%m" | sort | uniq -c | awk '{print $2, $3, $1}'

Get teh total commits per contributor

git log --pretty=format:'%an %ad' --date=format:'%Y-%m' | awk '{print $1, $2}' | sort | uniq -c | awk '{print $2, $3, $1}'