# HG changeset patch # User Meredith Howard # Date 1568958717 18000 # Node ID 2693c3ccb0daa8348ecb10f62dfe6f042884c0e6 # Parent 5b1ae7f6ee1efa9c855c690199ab128672f86728 rearrange diff --git a/.gitconfig b/.gitconfig --- a/.gitconfig +++ b/.gitconfig @@ -26,6 +26,21 @@ glog = log --graph --pretty=onelinecustom recent = "!f() { git for-each-ref --count=20 --sort=-committerdate --format=\"%(committerdate:short) %(refname:short)\" ${1:-refs/heads} ${@:2}; }; f" +[pretty] + onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset + +[ui] + color = true + +[core] + pager = LESS=FSRXi less + +[gpg] + program = "gpg2" + +[merge] + tool = vimdiff2 + [branch] autosetuprebase = always autosetupmerge = always @@ -34,21 +49,9 @@ verbose = true gpgsign = true -[core] - pager = LESS='FSRXi' less - [diff] compactionheuristic = true -[gpg] - program = "gpg2" - -[merge] - tool = vimdiff2 - -[pretty] - onelinecustom = tformat:%C(magenta)%h%Creset %G? -%C(yellow)%d%Creset %s %C(green)(%cr)%Creset %C(cyan)<%an>%Creset - [push] default = current @@ -63,9 +66,6 @@ [transfer] fsckobjects = true -[ui] - color = true - # include.path is available in git 1.7.10 and later [include] path = ~/.gitconfig.local