1cb3648eab
Update .logseq/config/plugins.edn Update Library/Application Support/Code/User/settings.json Update .local/bin/vpn Update .ssh/config
28 lines
672 B
Plaintext
28 lines
672 B
Plaintext
# ~/.gitconfig
|
|
|
|
[includeIf "gitdir:~/src/work/"]
|
|
path = .gitconfig-work
|
|
[includeIf "gitdir:~/src/private/"]
|
|
path = .gitconfig-private
|
|
|
|
# Special Cases
|
|
[includeIf "gitdir:/Users/beisel/.local/share/chezmoi/"]
|
|
path = .gitconfig-private
|
|
|
|
# Fallthrough
|
|
[user]
|
|
email = florian.beisel@intersport.de
|
|
name = Florian Beisel
|
|
[gpg]
|
|
format = ssh
|
|
[core]
|
|
excludesfile = /Users/beisel/.gitignore_global
|
|
autocrlf = input
|
|
[push]
|
|
autoSetupRemote = true
|
|
[init]
|
|
defaultBranch = main
|
|
[alias]
|
|
accept-ours = "!f() { git checkout --ours -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
|
|
accept-theirs = "!f() { git checkout --theirs -- \"${@:-.}\"; git add -u \"${@:-.}\"; }; f"
|