-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
62 lines (62 loc) · 1.66 KB
/
.gitconfig
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
[core]
excludesfile = ~/.gitignore_global
pager = delta
editor = nvim
[delta]
line-numbers = true
side-by-side = true
[push]
default = current
[fetch]
prune = true
[interactive]
diffFilter = delta --color-only
[credential]
helper = osxkeychain
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[user]
name = Richard Steinbrueck
email = [email protected]
signingkey = BE33D8C1950E31D3D2DCD6181A8D9CE1E74F05B1
[includeIf "gitdir:Projects/pixel-combo/"]
path = .gitconfig-pixelcombo
[includeIf "gitdir:Projects/"]
path = .gitconfig-pivat
[alias]
nevermind = !git reset --hard HEAD && git clean -d -f
plog = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative"
yolo = !git add -A && git commit -m \"$(curl --silent --fail http://whatthecommit.com/index.txt)\"
clone-for-worktrees = "!sh $HOME/bin/git-clone-bare-for-worktrees.sh"
[fetch "origin"]
prune = true
[pull]
rebase = true
[commit]
gpgsign = true
template = ~/.gitmessage
[gpg]
program = gpg2
[init]
defaultBranch = master
# define command which will be used when "nvim" is set as a merge tool
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
# set "nvim" as tool for merging
[merge]
tool = nvim
conflictstyle = diff3
[mergetool]
prompt = false
[diff]
colorMoved = default
[diff "ansible-vault"]
textconv = ansible-vault view
# Do not cache the vault contents
cachetextconv = false
[merge "ansible-vault"]
name = ansible-vault merge driver
driver = /usr/local/bin/ansible-vault-merge -- %O %A %B %P