summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--home/home-minimal.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index 58ca305..b9b1a9f 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -92,6 +92,9 @@
init.defaultBranch = "main";
alias.search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste";
merge.conflictStyle = "zdiff3";
+ push.autoSetupRemote = true;
+ commit.verbose = true;
+ rerere.enabled = true;
};
# diff-so-fancy.enable = true;