Commit Graph

5 Commits

Author SHA1 Message Date
ahuston-0 7be48fca2a fix some issues in .gitconfig
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-08-17 22:17:08 -04:00
ahuston-0 3445436a32 add comment for mergetool usage, ignore mergetool artifacts
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-28 16:41:25 +00:00
ahuston-0 0087268b21 cleanup git config
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-28 16:41:25 +00:00
ahuston-0 e743e3fbb8 change merge.tool to nvimdiff3, allow sops-mergetool to be executed anywhere
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-28 16:41:25 +00:00
ahuston-0 43dfbf673e git config changes
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
2024-04-28 16:41:25 +00:00