summaryrefslogtreecommitdiffstats
path: root/common/commandline
diff options
context:
space:
mode:
authorMinijackson <minijackson@riseup.net>2024-12-25 11:32:38 +0100
committerMinijackson <minijackson@riseup.net>2024-12-25 11:33:33 +0100
commit114c721d2f50a641aa6029d0e45e77883c9db76c (patch)
treeaf713c625f7c9d29da9a2828cb293d97a1d4b8d8 /common/commandline
parente62aebb3efeafc16c28c51ccd53652a0b042fa35 (diff)
downloadnixos-config-reborn-114c721d2f50a641aa6029d0e45e77883c9db76c.tar.gz
nixos-config-reborn-114c721d2f50a641aa6029d0e45e77883c9db76c.zip
common/git: configure private commits for jujutsu
Diffstat (limited to 'common/commandline')
-rw-r--r--common/commandline/git.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 96a95a8..2a2abcf 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -104,6 +104,8 @@ _inputs:
104 settings = { 104 settings = {
105 core.fsmonitor = "watchman"; 105 core.fsmonitor = "watchman";
106 106
107 git.private-commits = "description(glob:'wip:*') | description(glob:'private:*')";
108
107 merge-tools = { 109 merge-tools = {
108 difft.diff-args = [ 110 difft.diff-args = [
109 "--color=always" 111 "--color=always"