Few more FreeBSD fixes to dotfiles

This commit is contained in:
Colin Powell
2020-01-27 01:03:45 -05:00
parent adc472661f
commit bfbb3b2027
6 changed files with 21 additions and 6 deletions

View File

@ -27,9 +27,6 @@
hs = for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) - %(authorname) (%(color:green)%(committerdate:relative)%(color:reset))'
[merge]
conflictstyle = diff3
[pager]
diff = diff-so-fancy | less --tabs=1,5 -RFX
show = diff-so-fancy | less --tabs=1,5 -RFX
[gpg]
program = /usr/local/bin/gpg
[status]