mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-11-22 14:48:25 -06:00
git: update gitconfig settings
This commit is contained in:
1 file changed
+17
-2
+17
-2
@@ -15,6 +15,11 @@
|
|||||||
defaultBranch = main
|
defaultBranch = main
|
||||||
[alias] ; Command aliases for the git[1] command wrapper
|
[alias] ; Command aliases for the git[1] command wrapper
|
||||||
last = cat-file commit HEAD
|
last = cat-file commit HEAD
|
||||||
|
[diff]
|
||||||
|
algorithm = histogram
|
||||||
|
colorMoved = zebra # plain
|
||||||
|
mnemonicPrefix = true
|
||||||
|
renames = true
|
||||||
[branch]
|
[branch]
|
||||||
autoSetupRebase = always
|
autoSetupRebase = always
|
||||||
[checkout]
|
[checkout]
|
||||||
@@ -23,17 +28,27 @@
|
|||||||
format = ssh
|
format = ssh
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
[fetch]
|
||||||
|
all = true
|
||||||
|
prune = true
|
||||||
|
pruneTags = true
|
||||||
[tag]
|
[tag]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
sort = version:refname
|
||||||
[gpg "ssh"]
|
[gpg "ssh"]
|
||||||
allowedSignersFile = ~/.ssh/allowed_signers
|
allowedSignersFile = ~/.ssh/allowed_signers
|
||||||
|
[help]
|
||||||
|
autocorrect = prompt
|
||||||
[merge]
|
[merge]
|
||||||
|
conflitstyle = zdiff3
|
||||||
ff = only
|
ff = only
|
||||||
[push]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
autoSetupRemote = true
|
autoSetupRemote = true
|
||||||
|
followTags = true
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
autoupdate = true
|
||||||
[remote]
|
[remote]
|
||||||
pushDefault = origin
|
pushDefault = origin
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user