Git Recipes

git.md

Git Recipies for a good Git Cookbook (and misc tricks)

Git Log

• http://stackoverflow.com/questions/2954477/how-to-find-commits-by-a-specific-user-in-git
• http://git-scm.com/docs/git-log

git log --author=<pattern>

Search By Author (patter) and contains (pattern), case-insensitive

• https://www.atlassian.com/git/tutorials/git-log/

git log --author="linuxeron" --grep="fix" -i

The --stat option displays the number of insertions and deletions to each file altered by each commit (note that modifying a line is represented as 1 insertion and 1 deletion).

git log --stat

Git rm

• http://stackoverflow.com/questions/25436312/gitignore-not-working

git rm -r --cached .
git add .
git commit -m "fixed untracked files"

Git Graphic Log

• https://dzone.com/articles/lesser-known-git-commands

git log --graph --abbrev-commit --decorate --all --format=format:"%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)"

git config --global alias.grog 'log --graph --abbrev-commit --decorate --all --format=format:"%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)"'

Git rebase

git fetch && git pull origin/develop --rebase --autostash

Git merge dry-run

• https://stackoverflow.com/questions/501407/is-there-a-git-merge-dry-run-option

git merge --no-commit --no-ff $BRANCH
git merge --abort

How would I extract a single file (or changes to a file) from a git stash?

• https://stackoverflow.com/questions/1105253/how-would-i-extract-a-single-file-or-changes-to-a-file-from-a-git-stash

git diff stash@{0}^1 stash@{0} -- <filename>
git diff stash@{0}^! -- <filename>

Git shortlog

• https://stackoverflow.com/questions/9839083/git-number-of-commits-per-author-on-all-branches

git shortlog -s -n --all --no-merges

• https://news.ycombinator.com/item?id=9982543
• https://news.ycombinator.com/item?id=9982543

git shortlog -ns --no-merges v11..HEAD | head -n15
git shortlog -ns --no-merges n2.4..HEAD | head -n15

Git diff

git diff HEAD^^ HEAD main.c
git diff HEAD^^..HEAD -- main.c
git diff HEAD~2 HEAD -- main.c

Git misc

• https://stackoverflow.com/questions/17195861/undo-git-update-index-assume-unchanged-file

git update-index --assume-unchanged <file>

#Long Path Issue Windows OS
git config --system core.longpaths true

How to generate and apply patches with git?

• https://gist.github.com/nepsilon/22bc62a23f785716705c

1. Generate the patch:

git diff > some-changes.patch

2. Apply the diff:

Then copy this patch to your local machine, and apply it to your local working copy with:

git apply /path/to/some-changes.patch

Count Git commits per period

• https://stackoverflow.com/questions/36079884/count-git-commits-per-period

git rev-list --count --since="Dec 3 2015"  --before="Jan 3 2016" --all
git rev-list --count --since="Dec 3 2015"  --before="Jan 3 2016" --all --no-merges
git rev-list --count HEAD  --since=30.minute