From 087b393f1a1d787b88c3fcab7e400f70c6be2c50 Mon Sep 17 00:00:00 2001 From: sommerfeld Date: Fri, 17 Apr 2026 10:53:37 +0100 Subject: chore: clean up gitignore, extend mergiraf, add colorMovedWS - gitignore: remove redundant */node_modules/ (node_modules/ already matches at any depth), consolidate clangd cache pattern to **/ - attributes: add .tsx and .lua to mergiraf merge driver - config: add diff.colorMovedWS = allow-indentation-change to complement colorMoved, ignoring whitespace in moved blocks --- home/.config/git/attributes | 2 ++ 1 file changed, 2 insertions(+) (limited to 'home/.config/git/attributes') diff --git a/home/.config/git/attributes b/home/.config/git/attributes index 1870ab4..a9faf44 100644 --- a/home/.config/git/attributes +++ b/home/.config/git/attributes @@ -21,4 +21,6 @@ *.scala merge=mergiraf *.sbt merge=mergiraf *.ts merge=mergiraf +*.tsx merge=mergiraf *.py merge=mergiraf +*.lua merge=mergiraf -- cgit v1.2.3-70-g09d2