diff --git a/.gitconfig b/.gitconfig index 2049b16..48f2a7d 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,9 +1,17 @@ [user] name = Craige McWhirter email = craige@mcwhirter.io - signingkey = 0x7E66C3B5CDE94A4A -[includeIf "gitdir:~/source/IOHK/"] - path = ~/source/IOHK/.gitconfig + signingkey = 0xA4122FF3971B6865 +[includeIf "gitdir:~/source/intersectMBO/"] + path = ~/source/intersectMBO/.gitconfig +[includeIf "gitdir:~/source/IOG/"] + path = ~/source/IOG/.gitconfig +[includeIf "gitdir:~/forge/reciproka/"] + path = ~/forge/reciproka/.gitconfig +[includeIf "gitdir:~/forge/resrok/"] + path = ~/forge/resrok/.gitconfig +[includeIf "gitdir:~/forge/voc/"] + path = ~/forge/voc/.gitconfig [push] default = simple [gitreview] @@ -14,6 +22,14 @@ [commit] gpgsign = true [color] - ui = always + diff = auto + status = always + branch = auto + interactive = auto + ui = true + pager = true [pull] - rebase = true + ryuebase = true + rebase = false +[init] + defaultBranch = consensus