-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
94 lines (93 loc) · 2.33 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
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
[user]
name = Steven Harman
email = [email protected]
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOPMo6SIjMxmWIKV6G/mc/APTsEp6mDv0w/fF7ghXqPX
[gpg]
format = ssh
[gpg "ssh"]
program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"
allowedSignersFile = ~/.ssh/allowed_signers
[commit]
gpgSign = true
[init]
defaultBranch = main
templateDir = ~/.git_template
[color]
branch = auto
diff = auto
status = auto
[color "branch"]
current = yellow reverse
local = yellow
remote = green
[color "diff"]
meta = yellow
frag = magenta
old = red
new = green
[color "status"]
added = yellow
changed = green
untracked = cyan
[core]
autocrlf = false
legacyheaders = false
pager = delta
excludesfile = ~/.gitignore_global
[delta]
features = line-numbers decorations
syntax-theme = Monokai Extended
[interactive]
diffFilter = delta --color-only
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
trustExitCode = true
[difftool "p4diff"]
cmd = p4merge "$LOCAL" "$BASE"
[diff]
colorMoved = default
tool = Kaleidoscope
[difftool]
prompt = false
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool "p4merge"]
cmd = p4merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
trustExitCode = false
[merge]
tool = Kaleidoscope
[mergetool]
prompt = false
keepBackup = false
[fetch]
prune = true
[push]
default = simple
[gui]
fontdiff = -family Monaco -size 12 -weight normal -slant roman -underline 0 -overstrike 0
[repack]
usedeltabaseoffset = true
[alias]
aa = add --all
ch = cherry -v origin
ci = commit --verbose
co = checkout
dc = diff --cached
fa = fetch --all --prune
l = log --graph --pretty=format:'%Cred%h%Creset - %Cgreen(%ar) %C(bold blue)<%aN>% %C(yellow)%d%Creset %s' --abbrev-commit --date=relative
la = !git l --all
mine = log --author=Steven
mt = mergetool
st = status -sb
ctags = !.git/hooks/ctags
[rerere]
enabled = true
[stash]
showPatch = true
[tag]
forceSignAnnotated = true
# Custom config, such as setting up .ssh/config Host for GitHub Enterprise Cloud, EMU, etc…
# see: https://stevenharman.net/configure-ssh-keys-for-multiple-github-accounts
[include]
path = ~/.gitconfig_custom