-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
165 lines (138 loc) · 3.32 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
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
[include]
path = ~/.gitconfig.local
[init]
# templatedir = ~/.git_template
defaultBranch = main
[core]
editor = nano
# pager = delta
excludesfile = ~/.gitignore
[alias]
r = !GIT_NO_PAGER=1 git l -30
ra = !git r --all
l = !git pretty-log
la = !git l --all
co = checkout
cl = clone
c = commit
a = add
aa = add -A
ap = add --patch
addup = remote add upstream
f = fetch
fu = fetch upstream
d = diff
ds = diff --staged
wip = commit -m "WIP"
graft = merge --no-ff
rb = rebase
dft = difftool
project-summary = !which onefetch && onefetch
append = town append
diff-parent = town diff-parent
hack = town hack
kill = town kill
new-pull-request = town new-pull-request
prepend = town prepend
prune-branches = town prune-branches
rename-branch = town rename-branch
repo = town repo
ship = town ship
sync = town sync
[color]
ui = auto
# [color "diff"]
# meta = yellow bold
# commit = green
# frag = magenta bold
# old = red bold
# new = green
# whitespace = red reverse
# [color "diff-highlight"]
# oldNormal = red bold
# oldHighlight = "red bold 52"
# newNormal = "green"
# newHighlight = "green 22"
# [color "branch"]
# current = yellow reverse
# local = yellow
# remote = green
# [color "status"]
# added = yellow
# changed = green
# untracked = cyan
[commit]
template = ~/.gitmessage
gpgsign = true
[merge]
conflictstyle = diff3
[diff]
tool = difftastic
# colorMoved = default
# compactionHeuristic = true
external = difft
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[rebase]
autosquash = true
[pager]
difftool = true
# log = diff-highlight | less -r
# diff = diff-so-fancy | less --tabs=4 -RFX
# show = diff-so-fancy | less --tabs=4 -RFX
# [interactive]
# diffFilter = delta --color-only --features=interactive
# [color "diff-highlight"]
# oldNormal = red bold
# oldHighlight = red bold 52
# newNormal = green
# newHighlight = green 22
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[user]
name = Forest Carlisle
email = [email protected]
signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK3d/97XZ3IU+EQtXAxfNqOiblwwK+Lv4MYuq1sKFzRu
[github]
user = forest
[hub]
protocol = https
[gitProcess]
keepLocalIntegrationBranch = true
[pull]
rebase = true
[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
[gpg]
format = ssh
[gpg "ssh"]
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
[delta]
features = side-by-side line-numbers decorations
syntax-theme = Dracula
plus-style = syntax "#003800"
minus-style = syntax "#3f0001"
navigate = true
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
hunk-header-decoration-style = cyan box ul
[delta "line-numbers"]
line-numbers-left-style = cyan
line-numbers-right-style = cyan
line-numbers-minus-style = 124
line-numbers-plus-style = 28
[git-town]
ship-delete-tracking-branch = false
[gitbutler]
aiModelProvider = anthropic