-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
45 lines (40 loc) · 965 Bytes
/
.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
# This is Git's per-user configuration file.
[user]
name = David Hoff-Vanoni
email = [email protected]
signingkey = CFD24465A8E238C0
[alias]
co = checkout
br = branch
ci = commit
st = status
unstage = reset HEAD --
permission-reset = !git diff -p -R --no-color | grep -E \"^(diff|(old|new) mode)\" --color=never | git apply
[color]
ui = true
[commit]
gpgsign = true
[core]
attributesfile = ~/.gitattributes
excludesfile = ~/.gitignore_global
[fetch]
prune = true
[init]
defaultBranch = main
[pull]
ff = only
# See https://www.sublimemerge.com/docs/command_line
[mergetool "smerge"]
cmd = smerge mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" -o \"$MERGED\"
trustExitCode = true
[merge]
tool = smerge
# See https://github.blog/2015-07-29-git-2-5-including-multiple-worktrees-and-triangular-workflows/
[remote]
pushdefault = origin
[push]
default = current
# See https://bun.sh/docs/install/lockfile
[diff "lockb"]
textconv = bun
binary = true