-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
68 lines (56 loc) · 1.39 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
[include]
path = .gitconfig.local
path = .gitconfig.platform
[alias]
recent = !git for-each-ref --sort=-committerdate refs/heads/ --color=always --format='%(color:green)%(committerdate:relative)%09%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(contents:subject) - %(color:magenta)%(authorname)' | less -R
[commit]
gpgsign = true
[core]
editor = $EDITOR
quotepath = false
excludesfile = ~/.gitignore
commentChar = ";"
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[fetch]
prune = true
[format]
pretty = %Cblue%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold cyan)<%an>%Creset
[help]
autocorrect = 1
[log]
abbrevCommit = true
[pull]
ff = only
[push]
default = current
followTags = true
autoSetupRemote = true
[rebase]
autosquash = true
[rerere]
enabled = true
autoupdate = false
[user]
name = Greg Losie
email = [email protected]
[init]
defaultBranch = main
[diff]
tool = Kaleidoscope
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
[difftool]
prompt = false
trustExitCode = true
[merge]
conflictStyle = zdiff3
tool = Kaleidoscope
[mergetool "Kaleidoscope"]
cmd = ksdiff --merge --output \"$MERGED\" --base \"$BASE\" -- \"$LOCAL\" --snapshot \"$REMOTE\" --snapshot
trustExitCode = true
[mergetool]
prompt = false