[user] name = Donald Burr email = dburr@borg-cube.com signingkey = dburr@borg-cube.com [color] ui = true diff = auto status = auto branch = auto [core] #excludesfile = ~/.gitignore editor = vim autocrlf = input [push] default = current [credential] helper = osxkeychain #helper = store [alias] tree = log --graph --simplify-by-decoration --pretty=format:'%d' --all tree2 = log --graph --full-history --all --color --pretty=format:"%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s" --simplify-by-decoration l = log --graph --oneline --decorate ll = log --graph --oneline --decorate --branches --tags lll = log --graph --oneline --decorate --all lp = log --graph --all --format='%C(cyan dim) %p %Cred %h %C(white dim) %s %Cgreen(%cr)%C(cyan dim) <%an>%C(bold yellow)%d%Creset' lsi = clean -ndX lg1 = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all lg2 = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all lg = !"git lg1" gitignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi" [difftool "sourcetree"] cmd = opendiff \"$LOCAL\" \"$REMOTE\" path = [mergetool "sourcetree"] cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\" trustExitCode = true #[merge] # ff = false