-
Notifications
You must be signed in to change notification settings - Fork 1
/
.gitconfig
77 lines (68 loc) · 1.78 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
[user]
name = Jason R. Coombs
email = [email protected]
signingkey = 708E6CB181B4C47E
[init]
defaultBranch = main
[commit]
template = ~/.stCommitMsg
gpgsign = true
[tag]
gpgSign = true
[url "https://github.com/"]
insteadOf = gh://
[url "[email protected]:"]
insteadOf = hk:
[url "https://gitlab.com/"]
insteadOf = gl://
[url "https://bitbucket.org/"]
insteadOf = bb://
[url "https://gist.github.com/"]
insteadOf = gist://
[url "https://git.openstack.org/openstack/"]
insteadOf = os://
[url "https://git.code.sf.net/p/"]
insteadOf = sf://
[push]
default = simple
followTags = true
autoSetupRemote = true
[alias]
tags = tag --sort=-taggerdate
lol = log --pretty=format:\"%C(green)%h %C(yellow)[%ad]%Cred%d %Creset%s%Cblue [%cn]\" --decorate --date=relative --graph
atag = tag -a -m ""
tag = atag
[core]
excludesfile = ~/.gitignore_global
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Applications/Sourcetree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[mergetool "smerge"]
cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
[merge]
# tool = opendiff
tool = smerge
[pull]
rebase = false
[mergetool "known-merge"]
cmd = py -m jaraco.develop.merge "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
trustExitCode = true
[safe]
directory = ~/code/python/importlib_resources
bareRepository = explicit
[include]
path = ~/.config/git/config
[includeIf "gitdir:code/privacymate/"]
path = ~/pm/.gitconfig
[includeIf "gitdir:code/yg/"]
path = ~/yg/.gitconfig
[includeIf "hasconfig:remote.*.url:sso://**"]
path = config/google3/experimental/users/jaraco/config/.gitconfig
[advice]
detachedHead = false
[rerere]
enabled = true