[color] diff = auto status = auto branch = auto ui = auto # To determine user and GPG key ID, we source this file: [include] path = ~/.gitconfig.local # ...with the following content: ## vim:syntax=gitconfig #[user] # name = John McDoe III # email = fekyourspam@example.com # signingkey = 1FEDBEEFC0DEDBAD [log] date = iso [alias] st = status lg = log -p dc = diff --cached lol = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit lola = log --graph --decorate --pretty=format:'%C(auto)%h %G? %d %s%Creset' --abbrev-commit --all ls = ls-files compactlog = log --pretty=format:"%h%x09%an%x09%ad%x09%s" --date=short # check out existing remote branch, e.g. origin/branchname cb = checkout --track co = checkout cob = checkout -b c = commit --verbose ca = commit --verbose --all s = status --short l = log --color --graph --pretty=format:'%C(auto)%h %G? %d %s%Creset' gi = init --bare gs = init --bare --shared aa = add --all --verbose ap = add -p up = pull --rebase=preserve fa = fetch --all --verbose gr = grep --break --heading --line-number d = diff ds = diff --stat dc = diff --cached la = "!git config -l|grep alias|cut -c 7-|sort|sed \"s/^\\([^=]\\+\\)=/\\1€/g\"|sed \"s|€/|@/|g;s|ts€|ts@|g;s|^la.*|la€|g\"|column -ts€" alias = "!git config -l|grep alias|cut -c 7-|sort" cs = "!GPG_TTY=$(tty) git commit -S --verbose" csa = "!GPG_TTY=$(tty) git commit -S --verbose --all" csp = "!GPG_TTY=$(tty) git commit -S -pv" tag = "!GPG_TTY=$(tty) git tag -s" tty = "!export GPG_TTY=$(tty)" puv = push --verbose puff = "!git puv" pl = pull -tpf p = pull -tpf branchpull = remote update origin --prune branchremdel = push origin --delete ba = branch --list --all [push] default = simple [core] editor = vim fileMode = true [merge] tool = vimdiff [mergetool] keepBackup = false [gui] fontui = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 fontdiff = -family Hack -size 11 -weight normal -slant roman -underline 0 -overstrike 0 [commit] gpgSign = true #[gpg] # program = /usr/bin/gpg2 [http] #proxy = http://10.0.0.1:3128/