-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
104 lines (98 loc) · 3.28 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
[init]
defaultBranch = main
[log]
decorate = auto
date = iso
[user]
name = Chris Houhoulis
[remote "upstream"]
tagOpt = --tags
[branch]
autosetuprebase = always
sort = -committerdate
[color]
ui = always
# showbranch = never
diff = always
[diff]
renames = copies
colorMoved = default
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
commit = green
meta = yellow
frag = cyan
old = red
new = green
whitespace = red reverse
[status]
showUntrackedFiles = all
[alias]
brm = merge --no-ff --log --no-commit
co = checkout
sv = stash save
li = stash list
ap = stash apply
branchdiff = log --left-right --graph --cherry-pick --pretty=format:'%C(yellow)%h %Cred%ad %Cblue%an%Cgreen%d %Creset%s' --date=short
lo = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --
gr = log --graph --full-history --all --color --pretty=format:'%x1b[31m%h%x09%x1b[32m%d%x1b[0m%x20%s %C(blue)(%ar) %C(yellow)<%an>%Creset'
grog = log --graph --abbrev-commit --decorate --all --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)'
lol = log --graph --decorate --pretty=oneline --abbrev-commit
lola = log --graph --decorate --pretty=oneline --abbrev-commit --all
#recover-commit-message = "!f() { git commit -e --file=$(git rev-parse --git-dir)/COMMIT_EDITMSG; }; f"
recover-commit-message = "!git commit --edit --file=$(git rev-parse --git-dir)/COMMIT_EDITMSG"
[push]
default = tracking
[gc]
reflogExpire = 12 months
reflogExpireUnreachable = 12 months
rerereunresolved = 60 days
pruneExpire = 5 weeks ago
[core]
# excludesfile = /Users/xxxx/.gitignore_global
autocrlf = input
# pager = /usr/local/share/git-core/contrib/diff-highlight/diff-highlight | less
pager = delta # see https://github.com/dandavison/delta
editor = vim
[github]
user = houhoulis
[difftool]
prompt = false
# [pager]
# log = /usr/local/share/git-core/contrib/diff-highlight/diff-highlight | less
# show = /usr/local/share/git-core/contrib/diff-highlight/diff-highlight | less
# diff = /usr/local/share/git-core/contrib/diff-highlight/diff-highlight | less
[interactive]
# diffFilter = /usr/local/share/git-core/contrib/diff-highlight/diff-highlight
diffFilter = delta --color-only
[delta]
syntax-theme = Coldark-Dark
navigate = true # use n and N to move between diff sections
light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
# side-by-side = false
# line-numbers = false
keep-plus-minus-markers = true
minus-style = normal "#380000"
plus-style = auto "#002600"
zero-style = normal dim blink normal
# https://dandavison.github.io/delta/features-named-groups-of-settings.html
[delta "side-by-side"]
# side-by-side = true
# line-numbers = true
line-numbers-left-format = ""
line-numbers-right-format = "│ "
[merge]
conflictstyle = diff3
# thanks https://jvns.ca/blog/2024/02/16/popular-git-config-options/
[help]
autocorrect = prompt
[transfer]
fsckobjects = true
[fetch]
fsckobjects = true
[receive]
fsckObjects = true