git: dft alias for occasional difftastic use
This commit is contained in:
parent
ab7c37b962
commit
1dbdfca960
1 changed files with 7 additions and 0 deletions
|
|
@ -26,6 +26,9 @@ wsErrorHighlight = all
|
|||
[diff "rspec"]
|
||||
xfuncname = "^[ \t]*((RSpec|describe|context|it|before|after|around|feature|scenario|background)[ \t].*)$"
|
||||
|
||||
[difftool "difftastic"]
|
||||
cmd = difft "$LOCAL" "$REMOTE"
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
|
||||
|
|
@ -37,6 +40,9 @@ conflictStyle = diff3
|
|||
ff = only
|
||||
tool = nvimdiff
|
||||
|
||||
[pager]
|
||||
difftool = true
|
||||
|
||||
[pull]
|
||||
ff = only
|
||||
|
||||
|
|
@ -56,6 +62,7 @@ co = checkout
|
|||
cp = cherry-pick
|
||||
dc = diff --cached
|
||||
d = diff
|
||||
dft = difftool --tool=difftastic --no-prompt
|
||||
dn = diff --name-only --relative
|
||||
dw = diff --word-diff
|
||||
dww = diff --word-diff --word-diff-regex=.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue