Improved git config
This commit is contained in:
parent
b45e45939a
commit
1b8d2d0a3c
3
git-alten/dot-gitconfig
Normal file
3
git-alten/dot-gitconfig
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
[include]
|
||||||
|
path = ~/.dotfiles/git/profiles/common
|
||||||
|
path = ~/.dotfiles/git/profiles/ALTEN
|
|
@ -1,2 +1,2 @@
|
||||||
gitignore
|
gitignore
|
||||||
gitconfig
|
profiles
|
||||||
|
|
|
@ -1,31 +1,6 @@
|
||||||
[user]
|
[include]
|
||||||
name = Dreaded_X
|
path = ~/.dotfiles/git/profiles/common
|
||||||
email = tim@huizinga.dev
|
path = ~/.dotfiles/git/profiles/Dreaded_X
|
||||||
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
|
|
||||||
|
|
||||||
[includeIf "gitdir:~/Projects/ALTEN/"]
|
[includeIf "gitdir:~/Projects/ALTEN/"]
|
||||||
path = ~/.dotfiles/git/gitconfig/ALTEN
|
path = ~/.dotfiles/git/gitconfig/ALTEN
|
||||||
|
|
|
@ -1,3 +1,6 @@
|
||||||
[user]
|
[user]
|
||||||
name = Tim Huizinga
|
name = Tim Huizinga
|
||||||
email = tim.huizinga@alten.nl
|
email = tim.huizinga@alten.nl
|
||||||
|
|
||||||
|
[commit]
|
||||||
|
gpgsign = false
|
7
git/profiles/Dreaded_X
Normal file
7
git/profiles/Dreaded_X
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
[user]
|
||||||
|
name = Dreaded_X
|
||||||
|
email = tim@huizinga.dev
|
||||||
|
signingkey = CD17A34CBFB21DE9A73D47EB76BDEC4E165D8AD9
|
||||||
|
|
||||||
|
[commit]
|
||||||
|
gpgsign = true
|
23
git/profiles/common
Normal file
23
git/profiles/common
Normal file
|
@ -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
|
Loading…
Reference in New Issue
Block a user