Commit graph

12 commits

Author SHA1 Message Date
934a07640e
git: unset conflictStyle
diff3 adds a lot of lines to do the conflict,
which can make it harder to understand in full sometimes.

especially when the lsp is just filling it with errors
2026-06-26 07:42:05 -07:00
a3b7696382
git: remove delta configuration
delta is an extra package, makes the config weird,
and makes it difficult to copy diffs to share.
2026-06-26 07:41:52 -07:00
8a60b5a1c1
feat(git): do enable push.autoSetupRemote
the convinience is real
2026-05-25 21:16:20 -07:00
0c20f91a36
style(git): NOTE -> FIXME 2026-05-01 14:33:33 -07:00
d475051f88
feat(defaults/git): remove unneeded configs
The credential helper set like this took a little system resources,
and should be generally configured on a case-by-case basis.

push.autoSetupRemote isn't particularly useful,
as git does tell you what you have to do anyway,
and using it can cause you to push to the wrong place.
2026-04-26 08:37:25 -07:00
4dd72fdcb9
docs(defaults/git): add to comments 2026-04-26 08:36:53 -07:00
f3c3add058
style(defaults/git): avoid using lib.mkMerge
This makes the code easier to understand,
and might fix a problem I noticed a while ago.
2026-04-26 08:25:26 -07:00
Elec3137
661e98e802 fix(defaults): allow changing programs.git.enable 2026-03-29 21:06:37 -07:00
Elec3137
c83ec91ae2 defaults/git: add note, refine delta code 2026-03-24 11:49:12 -07:00
Elec3137
4ea28e824c defaults: enable git if allowed 2026-03-23 21:21:24 -07:00
Elec3137
d8071797fd defaults: cleanup 2026-03-23 21:00:42 -07:00
Elec3137
00c06f982b treewide: move defaults to dedicated folder 2026-03-23 20:41:34 -07:00
Renamed from cli/git.nix (Browse further)