From bb9c8bad7f3d1e12887dabdad5b4a5ab5aa9d036 Mon Sep 17 00:00:00 2001 From: Connor Braa Date: Fri, 1 Jul 2022 11:48:50 -0700 Subject: [PATCH] Update README.md to include git 2.37.0 workaround see https://github.com/dandavison/delta/issues/1114 --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2ac97a828..6ac1a819a 100644 --- a/README.md +++ b/README.md @@ -23,10 +23,12 @@ [interactive] diffFilter = delta --color-only +[add.interactive] + useBuiltin = false # required for git 2.37.0 [delta] - navigate = true # use n and N to move between diff sections - light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) + navigate = true # use n and N to move between diff sections + light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal) [merge] conflictstyle = diff3