[user] name = Morgan Wattiez email = morgan.wattiez@collibra.com [alias] tags = log --no-walk --tags --pretty=\"%h %d %s\" --decorate=full lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit st = status # View abbreviated SHA, description, and history graph of the latest 20 commits. l = log --pretty=oneline -n 20 --graph --abbrev-commit # View the current working tree status using the short format. s = status -s # Show the diff between the latest commit and the current state. d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat" # `git di $number` shows the diff between the state `$number` revisions ago and the current state. di = !"d() { git diff --patch-with-stat HEAD~$1; }; git diff-index --quiet HEAD -- || clear; d" # Switch to a branch, creating it if necessary. go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f" # Show verbose output about tags, branches or remotes tags = tag -l branches = branch --all remotes = remote --verbose # List contributors with number of commits. contributors = shortlog --summary --numbered contrib = ! git log --pretty=format:'%aN' | sort | uniq -c | sort -nr whois = ! sh -c 'git log -i --pretty=\"format:%an <%ae>\" --author=\"\" | sort -u' - # Show the user email for the current repository. whoami = config user.email di = diff -w --color-words=. ac = ! git add . && git commit -v unstage = reset HEAD ru = clean -f b = branch -vvar follow = ! sh -c 'git checkout -t origin/$1' - unfollow = ! git checkout master && git branch -d sortdiff = ! sh -c 'git diff | grep ^[+-] | sort --key=1.2 | uniq -u -s1' hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short type = cat-file -t dump = cat-file -p times = "!git log --author=\"$(git config user.name)\" \ --date=iso \ --format=\"%ad\" \ --date=\"format:%H\" \ | awk '{n=$1+0;if(H[n]++>max)max=H[n]}END{for(i=0;i<24;i++){printf\"%02d -%5d \",i,H[i];for(n=0;n\" -C HEAD; }; f" # List aliases. aliases = config --get-regexp alias # Amend the currently staged files to the latest commit. amend = commit --amend --reuse-message=HEAD [help] autocorrect = -1 # not more git psuh [init] templateDir = /Users/morganwattiez/.git-template [core] pager = delta --line-numbers --diff-highlight # Treat spaces before tabs and all kinds of trailing whitespace as an error. # [default] trailing-space: looks for spaces at the end of a line # [default] space-before-tab: looks for spaces before tabs at the beginning of a line whitespace = space-before-tab,-indent-with-non-tab,trailing-space [diff] noprefix = true [apply] # Detect whitespace errors when applying a patch. whitespace = fix [branch] # Show most recently changed branches first. sort = -committerdate tool = colordiff [difftool "colordiff"] cmd = colordiff -ydw \"$LOCAL\" \"$REMOTE\" [url "git@github.com:"] insteadOf = https://github.com/ [difftool] prompt = false [delta] plus-color = "#012800" minus-color = "#340001" theme = Monokai Extended [interactive] diffFilter = delta --color-only