File tree 3 files changed +41
-18
lines changed
3 files changed +41
-18
lines changed Original file line number Diff line number Diff line change
1
+ nix.conf
Original file line number Diff line number Diff line change 57
57
cm = "commit -m" ;
58
58
} ;
59
59
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
+ } ;
62
75
core . autocrlf = false ;
63
- pull . ff = "only" ;
76
+ pull = {
77
+ ff = "only" ;
78
+ rebase = true ;
79
+ } ;
64
80
init . defaultBranch = "main" ;
65
81
merge . conflictstyle = "zdiff3" ;
66
82
blame . ignoreRevsFile = ".git-blame-ignore-revs" ;
83
+ help . autocorrect = "prompt" ;
84
+ commit . verbose = true ;
85
+ rerere = {
86
+ enabled = true ;
87
+ autoupdate = true ;
88
+ } ;
67
89
} ;
68
90
} ;
69
91
You can’t perform that action at this time.
0 commit comments