diff options
| author | Minijackson <minijackson@riseup.net> | 2024-10-02 17:43:57 +0200 |
|---|---|---|
| committer | Minijackson <minijackson@riseup.net> | 2024-10-02 17:43:57 +0200 |
| commit | b269df52cb1f9300d637dd601021fba1232ae9f1 (patch) | |
| tree | 5ee01cbb403256e2ab6bfc6a5bbf824775ecc1a8 /common | |
| parent | e743e2de7e0f632ab993b256849c439428423c31 (diff) | |
| download | nixos-config-reborn-b269df52cb1f9300d637dd601021fba1232ae9f1.tar.gz nixos-config-reborn-b269df52cb1f9300d637dd601021fba1232ae9f1.zip | |
common/git: use nvim as jujutsu's merge-editor
Diffstat (limited to 'common')
| -rw-r--r-- | common/commandline/git.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix index c107413..f3ba3e8 100644 --- a/common/commandline/git.nix +++ b/common/commandline/git.nix | |||
| @@ -131,6 +131,7 @@ _inputs: | |||
| 131 | # TODO: setup hunk.nvim as diff-editor | 131 | # TODO: setup hunk.nvim as diff-editor |
| 132 | # diff-editor = "nvim"; | 132 | # diff-editor = "nvim"; |
| 133 | diff.tool = "difft"; | 133 | diff.tool = "difft"; |
| 134 | merge-editor = "nvim"; | ||
| 134 | }; | 135 | }; |
| 135 | 136 | ||
| 136 | signing = { | 137 | signing = { |