# Global Git configuration file. dnl Load m4 macros. include(../lib.m4) [user] name = Simon Ruderich email = simon@ruderich.org [color] ui = auto [core] editor = vim # Can't use ~/ because of older git versions. excludesfile = GITIGNORE # Use pager for the following commands. [pager] status = yes tag = yes [alias] # Shortcuts for often used commands. c = commit -v ci = commit -v d = diff --patience di = diff --patience dc = diff --patience --cached s = status st = status l = log ls = log --stat lp = log -p --patience glog = log --pretty=oneline --graph --all a = add ap = add -p au = add -u co = checkout b = branch -av br = branch -av m = merge me = merge f = fetch fe = fetch t = tag p = push pu = push ru = remote update fs = fsck --strict --full ss = stash save ssk = stash save --keep-index sa = stash apply sl = stash list fp = format-patch [diff] # Detect copies and renames. renames = copy # Allow diffing of PDF files. `pdftotext-` is a wrapper around pdftotext which # writes to stdout. [diff "pdf"] textconv = pdftotext- [diff "sqlite"] textconv = sqlite3dump [merge] IF(OS, darwin) tool = opendiff FI IF(OS, debian) tool = vimdiff FI [format] # When using git format-patch use threads and add all patches as # replies to the first one. thread = shallow # vim: ft=gitconfig