diff options
| author | Loek Le Blansch <loek@pipeframe.xyz> | 2026-01-16 20:03:07 +0100 |
|---|---|---|
| committer | Loek Le Blansch <loek@pipeframe.xyz> | 2026-01-16 20:03:07 +0100 |
| commit | 115ac49aa95caa4e648629f55ae287263a48655c (patch) | |
| tree | a6feb177733475c85e13a5f2e2f43bdd590a5b83 /.config/git/config##template | |
| parent | cbc28cd4f307804b84e8c96b4717d85f6b0ed008 (diff) | |
Diffstat (limited to '.config/git/config##template')
| -rw-r--r-- | .config/git/config##template | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/.config/git/config##template b/.config/git/config##template index 0a3418a..3c996ba 100644 --- a/.config/git/config##template +++ b/.config/git/config##template @@ -37,7 +37,13 @@ ec = !git conflict -z | xargs -0 -- $EDITOR ours = !git conflict -z | xargs -0 -- git checkout --ours theirs = !git conflict -z | xargs -0 -- git checkout --theirs + nuke = !git reset --hard && git clean -fxd [pager] - log = diff-highlight | less - show = diff-highlight | less - diff = diff-highlight | less + log = delta + show = delta + diff = delta + blame = delta +[delta] + tabs = 2 + side-by-side = false + syntax-theme = base16 |