jdkaplan/dotfiles
1
0
Fork 0
Code Activity

git: dft alias for occasional difftastic use

Browse source
This commit is contained in:
Jeremy Kaplan 2022-04-16 21:20:31 -07:00
commit 1dbdfca960
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
git/config
View file

@ -26,6 +26,9 @@ wsErrorHighlight = all
[diff "rspec"] [diff "rspec"]
xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario|background)[ \t].*)$" xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario|background)[ \t].*)$"
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[init] [init]
defaultBranch = main defaultBranch = main
@ -37,6 +40,9 @@ conflictStyle = diff3
ff = only ff = only
tool = nvimdiff tool = nvimdiff
[pager]
difftool = true
[pull] [pull]
ff = only ff = only
@ -56,6 +62,7 @@ co = checkout
cp = cherry-pick cp = cherry-pick
dc = diff --cached dc = diff --cached
d = diff d = diff
dft = difftool --tool=difftastic --no-prompt
dn = diff --name-only --relative dn = diff --name-only --relative
dw = diff --word-diff dw = diff --word-diff
dww = diff --word-diff --word-diff-regex=. dww = diff --word-diff --word-diff-regex=.