dotfiles/git/gitconfig

75 lines
1.6 KiB
Plaintext
Raw Normal View History

2019-07-23 11:13:10 +00:00
[user]
2020-07-16 07:12:07 +00:00
useConfigOnly = true
[user "changeme"]
2019-07-23 11:13:10 +00:00
name = changeme
2020-07-16 07:12:07 +00:00
email = changeme
signingkey = changeme
2021-01-13 07:54:31 +00:00
[user "private"]
name = Michael Mandl
email = mandlm@molez.net
signingkey = 4AA25D647AA54CC7
[user "swp"]
name = Michael Mandl
email = mandl@vi-bim.de
signingkey = 4E60F44227F611B4
2020-07-16 07:12:07 +00:00
[alias]
identity = "! git config user.name \"$(git config user.$1.name)\"; git config user.email \"$(git config user.$1.email)\"; git config user.signingkey \"$(git config user.$1.signingkey)\"; :"
[commit]
gpgsign = true
2019-07-23 11:13:10 +00:00
[push]
default = simple
[core]
editor = vim
pager = less -x1,5
editor = nvim
pager = less -S -x1,5
2019-07-23 11:13:10 +00:00
whitespace = cr-at-eol
2020-05-24 10:56:23 +00:00
excludesfile = ~/.gitignore
2019-07-23 11:13:10 +00:00
[rebase]
autostash = true
[color "diff"]
meta = yellow bold
frag = magenta bold
old = red bold
new = 64
whitespace = red reverse
[mergetool]
keepBackup = false
2020-05-24 10:57:45 +00:00
prompt = false
2019-07-23 11:13:10 +00:00
[diff]
tool = vimdiff
2020-05-24 10:57:45 +00:00
[difftool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
2021-01-13 07:54:31 +00:00
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
2020-05-24 10:57:45 +00:00
[difftool]
prompt = false
2019-07-23 11:13:10 +00:00
[gitflow]
multi-hotfix = true
[gitflow "branch"]
master = master
develop = develop
[gitflow "prefix"]
feature = feature/
bugfix = bugfix/
release = release/
hotfix = hotfix/
support = support/
versiontag =
[log]
date = relative
[format]
2020-07-03 06:38:17 +00:00
pretty = format:%C(yellow)%h %Cblue%>(12)%ad %C(red)%G? %Cgreen%<(7,trunc)%aN%Cred%d %Creset%s
2021-01-13 07:54:31 +00:00
[merge]
tool = bc
2020-05-24 10:57:45 +00:00
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
2021-01-13 07:54:31 +00:00
[mergetool "bc"]
path = /mnt/c/Program Files/Beyond Compare 4/BComp.exe
2019-10-03 10:56:06 +00:00
[rerere]
enabled = true
[fetch]
writeCommitGraph = true
2020-06-24 06:15:14 +00:00
[pull]
rebase = true