1
0
Fork 0

git: Add global attributes file

Thanks to this blog post:
https://tekin.co.uk/2020/10/better-git-diff-output-for-ruby-python-elixir-and-more
This commit is contained in:
Jeremy Kaplan 2020-10-22 20:41:15 -07:00
commit 6ae1330bdf
2 changed files with 6 additions and 0 deletions

View file

@ -17,6 +17,7 @@
~/.config/user-dirs.dirs: etc/user-dirs.dirs ~/.config/user-dirs.dirs: etc/user-dirs.dirs
~/.config/zsh: zsh/ ~/.config/zsh: zsh/
~/.emacs.d: emacs/ ~/.emacs.d: emacs/
~/.gitattributes: git/gitattributes
~/.gitignore: git/gitignore ~/.gitignore: git/gitignore
~/.my.cnf: mysql/.my.cnf ~/.my.cnf: mysql/.my.cnf
~/.psqlrc: psql/.psqlrc ~/.psqlrc: psql/.psqlrc

View file

@ -9,6 +9,10 @@ ui = true
colorMoved = default colorMoved = default
wsErrorHighlight = all wsErrorHighlight = all
# https://gist.github.com/tekin/12500956bd56784728e490d8cef9cb81#gistcomment-3500150
[diff "rspec"]
xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario|background)[ \t].*)$"
[merge] [merge]
conflictStyle = diff3 conflictStyle = diff3
ff = only ff = only
@ -58,6 +62,7 @@ helper = cache
verbose = true verbose = true
[core] [core]
attributesfile = ~/.gitattributes
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
[include] [include]