summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-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"