diff options
| author |  sommerfeld <sommerfeld@sommerfeld.dev> | 2025-01-31 17:31:41 +0000 |
|---|---|---|
| committer | sommerfeld <sommerfeld@sommerfeld.dev> | 2025-01-31 17:56:06 +0000 |
| commit | fd108b5b509d2b10193f53596d7b779be49fd805 (patch) | |
| tree | 223cfb24ec977653a40ae159c0cb471d6343b16c /home/.config | |
| parent | 1fb80b905de53155af8b38d8a4f31daa0733cb0b (diff) | |
| download | dotfiles-fd108b5b509d2b10193f53596d7b779be49fd805.tar.gz dotfiles-fd108b5b509d2b10193f53596d7b779be49fd805.tar.bz2 dotfiles-fd108b5b509d2b10193f53596d7b779be49fd805.zip | |
Add difftastic config
Diffstat (limited to 'home/.config')
| -rw-r--r-- | home/.config/git/config | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/home/.config/git/config b/home/.config/git/config index 8638332..72ba83c 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -24,8 +24,12 @@ [difftool] prompt = false trustExitCode = true +[pager] + difftool = true [difftool "nvimdiff"] cmd = $EDITOR -d $LOCAL $REMOTE +[difftool "difftastic"] + cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" [rebase] autoStash = true [fetch] @@ -113,7 +117,10 @@ find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'" gone = !git for-each-ref --format '%(refname:short) %(upstream:track)' | awk '$2 == \"[gone]\" {print $1}' | xargs -r git branch -D ab=absorb --and-rebase -[includeIf "gitdir:~/work/"] + # `git log` with patches shown with difftastic. + dl = -c diff.external=difft log -p --ext-diff + ds = -c diff.external=difft show --ext-diff + dft = -c diff.external=difft diff path = config-work [includeIf "gitdir:~/doxfiles/.git"] path = config-personal |