-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy path.gitconfig
More file actions
31 lines (31 loc) · 1.22 KB
/
.gitconfig
File metadata and controls
31 lines (31 loc) · 1.22 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
[user]
name = Gil Creque
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC9rYZrRE0Zgd6pnHLX4TZwyccS5jo4Obnd9lgnWULJuDI7ZvYEgdKXZbAAC8IzCvpDdrROLbpQ70FWJAhKPfP6E1oeb29kJ6tnQ9txpvRGGvW4USQ6r6lygxmPiNpuWbGXwXSbbjVHP1OGpmWcNf1/iXXVGEUrXxDYSyYb7VHgZ+k9vZ6m2We26h9QOLoy2npQLeZnX9NmwJMB3a7d+wQSKjiGse1s9PTgRtJrFkTW0phnoDnKX1J9xX0vcOU/ubIx5Dewy6APsLeU2xSWz5RsBSGE95JmYvMHRw8eAQruk+o3KUuGz3mCwiVHvTlW2eXESpdk9LPWFLD3DsSghTf8R99GwNF7SPWapChZzp6DGgKAhcegI0A9JdygZ4ClpnpEBZz/BwHKqCIXSGL44O5CedmA4YD8VDivodRSLkeFYvm+3AKyWJucKlPyv16IvMbzpx5ihjDQR/nDpXnMnCwFkzhy/Z9nTr4eZqdKeq52nibzlYUfzh+VeEqN2SaNLQM=
[include]
path = ~/.gitconfig.aliases
[diff]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
[merge]
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false
[init]
defaultBranch = main
[fetch]
prune = true
[gpg]
format = ssh
[commit]
gpgsign = false
[core]
editor = code --wait
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign