mirror of https://gitlab.com/dabruh/dotfiles.git
Replace dunk with difftastic
This commit is contained in:
parent
05e1ba8a37
commit
def24f0ce4
15
.gitconfig
15
.gitconfig
|
@ -7,7 +7,8 @@
|
|||
st = status -sb
|
||||
stat = !git --no-pager diff --stat
|
||||
sw = switch
|
||||
dunk = !git diff | dunk
|
||||
dft = difftool
|
||||
dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff; }; f"
|
||||
|
||||
[pull]
|
||||
rebase = true
|
||||
|
@ -21,5 +22,17 @@
|
|||
[gitreview]
|
||||
remote = origin
|
||||
|
||||
[diff]
|
||||
tool = difftastic
|
||||
|
||||
[difftool]
|
||||
prompt = false
|
||||
|
||||
[difftool "difftastic"]
|
||||
cmd = difft "$LOCAL" "$REMOTE"
|
||||
|
||||
[pager]
|
||||
difftool = true
|
||||
|
||||
[include]
|
||||
path = ~/.config/git/.gitconfig
|
||||
|
|
|
@ -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: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
|
||||
|
|
Loading…
Reference in New Issue