diff options
| author | Charles Cabergs <me@cacharle.xyz> | 2023-10-06 23:04:14 +0200 |
|---|---|---|
| committer | Charles Cabergs <me@cacharle.xyz> | 2023-10-06 23:04:14 +0200 |
| commit | d2d4140f74d74f5e43d8226c66ed2a57692fb365 (patch) | |
| tree | a497c803164ecaab9e99d4081cc18c44066e61c5 /config/git | |
| parent | 40786e775c0d1540f88f8fab6af2a4b19a3e571e (diff) | |
| parent | 1d2e251d313a759246b95e6c4192e1e2c2f85bf4 (diff) | |
| download | dotfiles-d2d4140f74d74f5e43d8226c66ed2a57692fb365.tar.gz dotfiles-d2d4140f74d74f5e43d8226c66ed2a57692fb365.tar.bz2 dotfiles-d2d4140f74d74f5e43d8226c66ed2a57692fb365.zip | |
Merge branch 'master' of github.com:cacharle/dotfiles
Diffstat (limited to 'config/git')
| -rw-r--r-- | config/git/config.darwin | 33 | ||||
| -rw-r--r-- | config/git/config.linux | 7 |
2 files changed, 38 insertions, 2 deletions
diff --git a/config/git/config.darwin b/config/git/config.darwin index 7d27b5b..ac89ec5 100644 --- a/config/git/config.darwin +++ b/config/git/config.darwin @@ -1,3 +1,5 @@ +# vim:ft=gitconfig + [user] name = Charles Cabergs email = charles.cabergs@colruytgroup.com @@ -7,11 +9,40 @@ rebase = false [merge] tool = vimdiff + conflictstyle = diff3 [commit] gpgsign = false [init] defaultBranch = master [core] editor = "VIMINIT='' nvim" + pager = delta +[interactive] + diffFilter = delta --color-only --syntax-theme gruvbox-dark +[diff] + colorMoved = default +[delta] + syntax-theme = gruvbox-dark + # side-by-side = true + navigate = true # use n and N to move between diff sections + line-numbers = true -# vim:ft=gitconfig + +# [http] +# sslVerify = false +[credential] + helper = store +[filter "lfs"] + required = true + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process +[gpg] + format = ssh +[gpg "ssh"] + allowedSignersFile = + +[push] + autoSetupRemote = true +[tag] + sort = v:refname diff --git a/config/git/config.linux b/config/git/config.linux index aea7fb1..a7b8baa 100644 --- a/config/git/config.linux +++ b/config/git/config.linux @@ -1,3 +1,5 @@ +# vim:ft=gitconfig + [user] name = Charles Cabergs email = me@cacharle.xyz @@ -29,8 +31,11 @@ editor = "VIMINIT='' nvim" [safe] directory = * +[push] + autoSetupRemote = true # git push without remote and branch specified +[tag] + sort = v:refname # Sort tag by version instead of ascii sort -# vim:ft=gitconfig [filter "lfs"] required = true clean = git-lfs clean -- %f |