-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
69 lines (64 loc) · 1.99 KB
/
gitconfig
File metadata and controls
69 lines (64 loc) · 1.99 KB
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
63
64
65
66
67
68
69
[user]
name = Gustavo Medori
email = mail@gustavo.sh
signingkey = key::ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICe4grs0BTn06c7NIdENzJxnfV/Ytw9IYkRQXOkHITcI GitHub SSH Key
[diff]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
trustExitCode = true
[merge]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool "nvim"]
cmd = nvim -f -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool]
prompt = false
[rerere]
enabled = true
# Delta configs
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[add.interactive]
useBuiltin = false # required for git 2.37.0
[delta]
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
minus-style = "syntax #700000"
minus-emph-style = "normal #a00000"
minus-empty-line-marker-style = "normal #700000"
plus-style = "syntax #005000"
plus-emph-style = "normal #008c00"
plus-empty-line-marker-style = "normal #005000"
side-by-side = false
tabs = 2
[merge]
conflictstyle = diff3
[diff]
colorMoved = default
[alias]
lg = log --graph --abbrev-commit --format=format:'%C(blue)%h%C(reset) | %C(green)%ar%C(reset) - %C(dim white)%an%C(reset) %C(auto)%d%C(reset)%n | %s%n'
here = lg -1
# Personal git settings
# [includeIf "hasconfig:remote.*.url:git@github.com:gposcidonio/**"]
# path = "~/dotfiles/personal.gitconfig"
# [url "git@github.com:"]
# insteadOf = https://github.com/
[init]
defaultBranch = main
[pull]
rebase = false
[includeIf "gitdir:/Users/umbreon/"]
path = "~/dotfiles/work_specific/gitconfig"
[commit]
gpgsign = false
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[gpg]
format = ssh