diff options
| author | aszlig <aszlig@nix.build> | 2023-12-16 13:53:56 +0100 |
|---|---|---|
| committer | aszlig <aszlig@nix.build> | 2023-12-16 15:28:21 +0100 |
| commit | a3dc9adc6cf6de851e7faf55c3dcaa828f50224c (patch) | |
| tree | 1ba2f1c58e6273e3c8b3038fea5da8435012b7cd | |
| parent | 5e1fa7332e152586aa292a7dc5723853f9b41ba8 (diff) | |
profiles/workstation/git: Don't keep .orig files
While those .orig files might be useful for post-mortem analysis of a rebase or merge, I never actually use them and rather resort to things such as reflog to find the old tree/file. Having those .orig files around just adds unnecessary noise, so let's avoid that. Signed-off-by: aszlig <aszlig@nix.build>
| -rw-r--r-- | modules/user/aszlig/profiles/workstation/default.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/user/aszlig/profiles/workstation/default.nix b/modules/user/aszlig/profiles/workstation/default.nix index 359ef82f..e08b9b30 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -92,6 +92,7 @@ in { merge.tool = "vimdiff3"; merge.conflictstyle = "diff3"; + mergetool.keepBackup = false; delta = { commit-decoration-style = "bold yellow box"; |