From 9d933bb3f7b9fa7f141f9b27a0d3b1842bdc0803 Mon Sep 17 00:00:00 2001 From: Coelacanthus Date: Sun, 19 Dec 2021 21:07:59 +0800 Subject: [PATCH] git(delta): enable side-by-side as an workaround for line-wrapping [1]: https://github.com/dandavison/delta/issues/299#issuecomment-997388757 --- git/.config/git/format.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git/.config/git/format.config b/git/.config/git/format.config index 3875d338..81ba3bfd 100644 --- a/git/.config/git/format.config +++ b/git/.config/git/format.config @@ -68,11 +68,11 @@ line-numbers-plus-style = green line-numbers-left-style = blue line-numbers-right-style = blue - max-line-distance = 0.6 - max-line-length = 512 hyperlinks = true navigate = true navigate-regex = '^(commit|added:|removed:|renamed:|modified:|•)' + # FIXME: As a workarround, https://github.com/dandavison/delta/issues/299#issuecomment-997388757 + side-by-side = true [merge] conflictstyle = diff3