Skip to content

Commit 72a9452

Browse files
committed
Update git config
1 parent 4399e0c commit 72a9452

File tree

3 files changed

+41
-18
lines changed

3 files changed

+41
-18
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
nix.conf

flake.lock

+15-15
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

home-manager/home.nix

+25-3
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,35 @@
5757
cm = "commit -m";
5858
};
5959
extraConfig = {
60-
push.default = "current";
61-
push.autoSetupRemote = true;
60+
push = {
61+
default = "current";
62+
followTags = true;
63+
autoSetupRemote = true;
64+
};
65+
fetch = {
66+
prune = true;
67+
pruneTags = true;
68+
all = true;
69+
};
70+
rebase = {
71+
autoSquash = true;
72+
autoStash = true;
73+
updateRefs = true;
74+
};
6275
core.autocrlf = false;
63-
pull.ff = "only";
76+
pull = {
77+
ff = "only";
78+
rebase = true;
79+
};
6480
init.defaultBranch = "main";
6581
merge.conflictstyle = "zdiff3";
6682
blame.ignoreRevsFile = ".git-blame-ignore-revs";
83+
help.autocorrect = "prompt";
84+
commit.verbose = true;
85+
rerere = {
86+
enabled = true;
87+
autoupdate = true;
88+
};
6789
};
6890
};
6991

0 commit comments

Comments
 (0)