diff options
Diffstat (limited to 'modules/user/aszlig/profiles/workstation/default.nix')
| -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 aff89628..c6b86413 100644 --- a/modules/user/aszlig/profiles/workstation/default.nix +++ b/modules/user/aszlig/profiles/workstation/default.nix @@ -92,6 +92,7 @@ in { rerere.autoupdate = true; commit.gpgsign = true; pull.rebase = false; + branch.sort = "-committerdate"; merge.tool = "vimdiff3"; merge.conflictstyle = "diff3"; |