From 794e27b6be2252e6a1f694aacf4ab02a003d34f0 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sun, 31 Jan 2021 10:39:44 +0100
Subject: git: allow applies with whitespace errors (needed for merges/rebases)

---
 git/.gitconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git/.gitconfig')

diff --git a/git/.gitconfig b/git/.gitconfig
index eaf548a..88ada2c 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -19,7 +19,7 @@
 	whitespace = blank-at-eol,blank-at-eof,space-before-tab,tab-indent
 	pager = less -x1,5
 [apply]
-	whitespace = error
+	#whitespace = error
 [mergetool]
 	keepBackup = false
 [difftool]
-- 
cgit v1.2.3