Jaculabilis/nixos-configs
1
1
Fork 0
Code Releases Activity

beatific: more git config

Browse Source
This commit is contained in:
Tim Van Baak 2025-03-11 15:42:41 -07:00
parent f7685b5f49
commit f9f883c395
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/beatific.nix
View File

@ -141,8 +141,26 @@ in {
git = {
enable = true;
config = {
column.ui = "auto";
init.defaultBranch = "master";
merge.conflictstyle = "diff3";
merge.conflictstyle = "zdiff3";
branch.sort = "-committerdate";
diff = {
algorithm = "histogram";
colorMoved = "plain";
mnemonicPrefix = true;
renames = true;
};
help.autocorrect = "prompt";
commit.verbose = true;
rerere = {
enabled = true;
autoupdate = true;
};
rebase = {
autoSquash = true;
autoStash = true;
};
alias = {
amend = "commit --amend";
fixup = "commit --amend --no-edit";