-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdot_gitconfig
60 lines (47 loc) · 1.31 KB
/
dot_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
[core]
longpaths = true
[user]
email = [email protected]
name = Marvin Stickel
signingKey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiwCazdKvr+ew56qdoGYNzeXwrql8fuoHqDRrV19IHY
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
allowedSignersFile = /Users/marvinstickel/.config/git/allowed_signers
[init]
defaultBranch = main
[commit]
gpgSign = true
[push]
autoSetupRemote = true
[tag]
forceSignAnnotated = true
[interactive]
diffFilter = delta --color-only
# Use VSCode as default diff and merge tool
[merge]
tool = vscode
conflictstyle = diff3
[mergetool "vscode"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[diff]
tool = vscode
colorMoved = default
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[alias]
lg = log --all --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
diff-delta = !git diff | delta
show-delta = !git show | delta
log-delta = !git log -p | delta
stash-show-delta = !git stash show -p | delta
reflog-delta = !git reflog -p | delta
add-delta = !git add -p | delta
diff-dunk = !git diff | dunk | delta
[url "[email protected]:"]
insteadOf = https://github.com/
[delta]
navigate = true
side-by-side = true
syntax-theme = OneHalfDark