From 9d77e3e058f346a1908966822c73369a379dd20c Mon Sep 17 00:00:00 2001 From: "Kenneth Benzie (Benie)" Date: Tue, 9 Jun 2020 12:08:58 +0100 Subject: [PATCH] Setup side-by-side diffs using vim Set `git difftool` to use `vimdiff` to display diffs, when multiple files are in the diff, don't prompt when exiting `vimdiff` before viewing the next file diffs. --- config | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config b/config index edc3a02..40f921b 100644 --- a/config +++ b/config @@ -59,6 +59,11 @@ [user] useConfigOnly = true +[diff] + tool = vimdiff +[difftool] + prompt = false + [include] path = ~/.config/private/gitconfig path = ~/.config/work/gitconfig