diff options
| -rw-r--r-- | home/.config/git/attributes | 2 | ||||
| -rw-r--r-- | home/.config/git/config | 1 | ||||
| -rw-r--r-- | home/.config/git/ignore | 11 |
3 files changed, 8 insertions, 6 deletions
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 diff --git a/home/.config/git/config b/home/.config/git/config index e59a2dc..87947d0 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -15,6 +15,7 @@ tool = nvimdiff algorithm = histogram colorMoved = default + colorMovedWS = allow-indentation-change mnemonicPrefix = true relative = true renameLimit = 10000 diff --git a/home/.config/git/ignore b/home/.config/git/ignore index 97d059d..07d5ee0 100644 --- a/home/.config/git/ignore +++ b/home/.config/git/ignore @@ -2,17 +2,15 @@ *.tar.gz *.tar.zst *.zip -*/.cache/clangd/index/ -*/node_modules/ .SRCINFO -.cache/clangd/index/ -.env/ -.venv/ +**/.cache/clangd/index/ __pycache__/ build*/ /compile_commands.json -env/ node_modules/ +.env/ +.venv/ +env/ venv/ .gdbinit .lldbinit @@ -20,3 +18,4 @@ venv/ .nvim/ .ignore /tablegen_compile_commands.yml +.git.copilot |