emidab
/
dotfiles
mirror of https://gitlab.com/dabruh/dotfiles.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace dunk with difftastic

This commit is contained in:
dabruh 2023-11-29 09:46:08 +01:00
parent 05e1ba8a37
commit def24f0ce4
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.gitconfig
View File

@ -7,7 +7,8 @@
st = status -sb st = status -sb
stat = !git --no-pager diff --stat stat = !git --no-pager diff --stat
sw = switch sw = switch
dunk = !git diff | dunk dft = difftool
dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff; }; f"
[pull] [pull]
rebase = true rebase = true
@ -21,5 +22,17 @@
[gitreview] [gitreview]
remote = origin remote = origin
[diff]
tool = difftastic
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[include] [include]
path = ~/.config/git/.gitconfig path = ~/.config/git/.gitconfig

3
.installer/packages
View File

@ -31,6 +31,7 @@ code-any:deerawan.vscode-faker # Misc
brew-any:kubectl helm shellcheck velero derailed/k9s/k9s fluxcd/tap/flux # Kubernetes related brew-any:kubectl helm shellcheck velero derailed/k9s/k9s fluxcd/tap/flux # Kubernetes related
brew-any:zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting # ZSH related brew-any:zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting # ZSH related
brew-host-5cg9521pyj:weaveworks/tap/gitops azure/kubelogin/kubelogin azure-cli git-review brew-any:difftastic # Git related
brew-host-5cg9521pyj:weaveworks/tap/gitops azure/kubelogin/kubelogin azure-cli git-review # Work related
krew-any:ctx krew ns slice stern tree krew-any:ctx krew ns slice stern tree