summaryrefslogtreecommitdiffstats
path: root/common/commandline
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2024-10-07 18:00:00 +0200
committerMinijackson <minijackson@riseup.net>2024-10-07 18:00:00 +0200
commitcda9d2b911a2aaa41887b202fe185ddd88dbf328 (patch)
tree3db14372b60b3fe4984215e93b5a2454cc2a376c /common/commandline
parenteb6750711a09df267ad80355c202a87fc665c703 (diff)
downloadnixos-config-reborn-cda9d2b911a2aaa41887b202fe185ddd88dbf328.tar.gz
nixos-config-reborn-cda9d2b911a2aaa41887b202fe185ddd88dbf328.zip
common/git: sort paths of jj diffs
Diffstat (limited to 'common/commandline')
-rw-r--r--common/commandline/git.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index f3ba3e8..24babd7 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -101,6 +101,7 @@ _inputs:
101 merge-tools = { 101 merge-tools = {
102 difft.diff-args = [ 102 difft.diff-args = [
103 "--color=always" 103 "--color=always"
104 "--sort-paths"
104 "$left" 105 "$left"
105 "$right" 106 "$right"
106 ]; 107 ];