Vinicius Deolindo
1742b5cb6a
mergiraf: add jujutsu integration
2026-02-01 14:06:20 +01:00
Austin Horstman
ac7c05a90c
git: extraConfig -> settings
...
Remove string support and convert to rfc42 settings option
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
2025-10-19 10:24:15 -05:00
Bob van der Linden
ba6aaa0e0a
mergiraf: add merge.conflictStyle git configuration
...
Mergiraf expects merge.conflictStyle to be "diff3" in git. If this isn't
the case, mergiraf cannot operate correctly. This change adds this
option to git's configuration.
2025-10-14 22:59:58 -05:00
Austin Horstman
86402a17b6
treewide: flatten single file modules
...
Some files don't need nesting and can be root level again to reduce
conflicts with other PRs.
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
2025-06-23 16:20:26 -05:00
Austin Horstman
4fca600cb1
treewide: implement auto importing for modules
...
Reduce maintenance burden and increase efficiency by automatically
importing modules following a specific convention.
Co-authored-by: awwpotato <awwpotato@voidq.com>
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
2025-06-22 23:58:37 -05:00
awwpotato
5da6eafceb
treewide: remove unused code ( #6985 )
2025-05-07 10:03:21 -05:00
Austin Horstman
cba2f9ce95
treewide: reformat nixfmt-rfc-style
...
Reformat repository using new nixfmt-rfc-style.
2025-04-08 08:50:05 -07:00
Bob van der Linden
d8b4ba070f
mergiraf: init module ( #6633 )
...
This adds git integration for mergiraf. It sets up git to use mergiraf
to automatically resolve merge conflicts.
2025-03-25 21:37:24 +01:00
