diff --git a/git-alten/dot-gitconfig b/git-alten/dot-gitconfig new file mode 100644 index 0000000..3250684 --- /dev/null +++ b/git-alten/dot-gitconfig @@ -0,0 +1,3 @@ +[include] + path = ~/.dotfiles/git/profiles/common + path = ~/.dotfiles/git/profiles/ALTEN diff --git a/git/.stow-local-ignore b/git/.stow-local-ignore index 8a1e37f..9ce6b4e 100644 --- a/git/.stow-local-ignore +++ b/git/.stow-local-ignore @@ -1,2 +1,2 @@ gitignore -gitconfig +profiles diff --git a/git/dot-gitconfig b/git/dot-gitconfig index f4cd172..5f77805 100644 --- a/git/dot-gitconfig +++ b/git/dot-gitconfig @@ -1,31 +1,6 @@ -[user] - name = Dreaded_X - email = tim@huizinga.dev - signingkey = CD17A34CBFB21DE9A73D47EB76BDEC4E165D8AD9 - -[push] - default = simple - -[core] - excludesfile = ~/.dotfiles/git/gitignore - -[color] - ui = true - -[credential] - helper = store -[pull] - ; If we pull we only want to fast forward, if that is not possible we should not allow pull to work - ; Instead use fetch and then either rebase or merge - ff = only - ; rebase = false -[init] - defaultBranch = master -[commit] - gpgsign = true - -[diff] - tool = nvimdiff +[include] + path = ~/.dotfiles/git/profiles/common + path = ~/.dotfiles/git/profiles/Dreaded_X [includeIf "gitdir:~/Projects/ALTEN/"] path = ~/.dotfiles/git/gitconfig/ALTEN diff --git a/git/gitconfig/ALTEN b/git/profiles/ALTEN similarity index 68% rename from git/gitconfig/ALTEN rename to git/profiles/ALTEN index abc9ea8..bf183b8 100644 --- a/git/gitconfig/ALTEN +++ b/git/profiles/ALTEN @@ -1,3 +1,6 @@ [user] name = Tim Huizinga email = tim.huizinga@alten.nl + +[commit] + gpgsign = false diff --git a/git/profiles/Dreaded_X b/git/profiles/Dreaded_X new file mode 100644 index 0000000..63e94b5 --- /dev/null +++ b/git/profiles/Dreaded_X @@ -0,0 +1,7 @@ +[user] + name = Dreaded_X + email = tim@huizinga.dev + signingkey = CD17A34CBFB21DE9A73D47EB76BDEC4E165D8AD9 + +[commit] + gpgsign = true diff --git a/git/profiles/common b/git/profiles/common new file mode 100644 index 0000000..e61bc22 --- /dev/null +++ b/git/profiles/common @@ -0,0 +1,23 @@ +[push] + default = simple + +[core] + excludesfile = ~/.dotfiles/git/gitignore + +[color] + ui = true + +[credential] + helper = store + +[pull] + ; If we pull we only want to fast forward, if that is not possible we should not allow pull to work + ; Instead use fetch and then either rebase or merge + ff = only + ; rebase = false + +[diff] + tool = nvimdiff + +[init] + defaultBranch = master