git: change difftool (delta -> difft)
This commit is contained in:
parent
aee39f036a
commit
ddd90709d2
@ -5,7 +5,6 @@
|
||||
[core]
|
||||
excludesfile = ~/.config/git/ignore
|
||||
editor = nvim
|
||||
pager = delta
|
||||
autocrlf = false
|
||||
quotepath = false
|
||||
|
||||
@ -20,19 +19,10 @@
|
||||
branch = auto
|
||||
ui = auto
|
||||
|
||||
[delta]
|
||||
line-numbers = true
|
||||
diff-so-fancy = true
|
||||
dark = true
|
||||
navigate = true
|
||||
syntax-theme = base16
|
||||
|
||||
[interactive]
|
||||
diffFilter = delta -n --color-only --diff-so-fancy
|
||||
|
||||
[diff]
|
||||
renames = true
|
||||
colorMoved = default
|
||||
external = difft
|
||||
|
||||
[merge]
|
||||
tool = nvimdiff
|
||||
@ -63,5 +53,9 @@
|
||||
br = branch
|
||||
bra = branch -a
|
||||
d = diff
|
||||
l = log --graph --decorate --oneline --date=iso
|
||||
delete-merged-branch = !git branch -l --merged main | rg -v \"(HEAD|main|\\*)\" | xargs -I % git branch -d %
|
||||
l = log -p --ext-diff
|
||||
ls = log --graph --decorate --oneline --date=iso
|
||||
delete-merged-branch = "!git branch -l --merged main | rg -v \"(HEAD|main|\\*)\" | xargs -I % git branch -d %"
|
||||
|
||||
; vim: noet ft=gitconfig
|
||||
; -*- indent-tabs-mode: t; tab-width: 4 -*-
|
Loading…
Reference in New Issue
Block a user