7 Commits

Author	SHA1	Message	Date
Tom Alexander	3706eda8f3	Use meld for git merges.	2024-01-10 22:20:30 -05:00
Tom Alexander	7960699636	Add a git alias "git amend". ... This allows us to generate a new git commit hash without changing the commit contents which is useful for triggering CI workflows.	2023-07-24 16:44:23 -04:00
Tom Alexander	bdff61d8e9	Change git default branch to main.	2023-07-18 15:04:24 -04:00
Tom Alexander	63b8827725	Set the default branch in git to the default to suppress the warning.	2023-07-08 22:57:26 -04:00
Tom Alexander	6e4fffbe9d	Specify git config on a per-user basis.	2022-10-27 00:22:06 -04:00
Tom Alexander	b69934072f	Move what can be shared in the base role out to the common tasks file.	2022-10-27 00:12:06 -04:00
Tom Alexander	2e0a6073c8	Add more config files to the base role.	2022-10-27 00:07:06 -04:00