git: Update git/config

This commit is contained in:
Ismo Vuorinen
2023-02-21 10:20:32 +02:00
parent 64f1d7354e
commit 65dab98c3e
2 changed files with 75 additions and 64 deletions

View File

@@ -33,10 +33,10 @@
required = true required = true
[init] [init]
defaultBranch = master defaultBranch = main
[pull] [pull]
rebase = false rebase = true
[color] [color]
ui = true ui = true
@@ -50,3 +50,6 @@
deleted = red bold strike deleted = red bold strike
untracked = cyan untracked = cyan
branch = yellow black bold ul branch = yellow black bold ul
[submodule]
recurse = true

View File

@@ -34,10 +34,10 @@
required = true required = true
[init] [init]
defaultBranch = master defaultBranch = main
[pull] [pull]
rebase = false rebase = true
[color] [color]
ui = true ui = true
@@ -51,16 +51,24 @@
deleted = red bold strike deleted = red bold strike
untracked = cyan untracked = cyan
branch = yellow black bold ul branch = yellow black bold ul
[gpg] [gpg]
format = ssh format = ssh
[gpg "ssh"] [gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
allowedSignersFile = ~/.ssh/allowed_signers allowedSignersFile = ~/.ssh/allowed_signers
[commit] [commit]
gpgsign = true gpgsign = true
[credential "https://github.com"] [credential "https://github.com"]
helper = helper =
helper = !/opt/homebrew/bin/gh auth git-credential helper = !/opt/homebrew/bin/gh auth git-credential
[credential "https://gist.github.com"] [credential "https://gist.github.com"]
helper = helper =
helper = !/opt/homebrew/bin/gh auth git-credential helper = !/opt/homebrew/bin/gh auth git-credential
[submodule]
recurse = true