From a3dc9adc6cf6de851e7faf55c3dcaa828f50224c Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 16 Dec 2023 13:53:56 +0100 Subject: 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 --- modules/user/aszlig/profiles/workstation/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/user/aszlig') 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"; -- cgit 1.4.1