|
|
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 |
|
|
|
0087268b21
|
cleanup git config
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
|
2024-04-28 16:41:25 +00:00 |
|
|
|
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 |
|
|
|
43dfbf673e
|
git config changes
Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
|
2024-04-28 16:41:25 +00:00 |
|
