-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
136 lines (121 loc) · 2.84 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
[user]
name = Adonis Kakoulidis
email = aklp08@gmail.com
[github]
user = varemenos
[core]
editor = nano
fileMode = false # ignore file rights changes
autocrlf = false # disable autocrlf mode
excludesfile = /Users/adonisk/.gitignore_global
pager = delta
[diff]
compactionHeuristic
[delta]
features = side-by-side line-numbers decorations hyperlinks # need to `export DELTA_PAGER="less -rX"` otherwise everything will look funky
syntax-theme = "Monokai Extended"
plus-style = 'syntax bold auto'
minus-style = 'syntax bold auto'
[log]
date=short
[push]
# 'git push' will push the current branch to its tracking branch
# the default is to push all branches
default = tracking
autoSetupRemote = true
[alias]
a = add
ap = add --patch
b = branch
bi = bisect
c = commit
ca = commit --amend
cl = clone
co = checkout
d = diff
dc = diff --cached
ds = diff --staged
dw = diff --word-diff
f = fetch
g = grep
i = init
l = log
lp = log --oneline
lv = log --oneline --graph
m = merge
mc = merge --continue
ma = merge --abort
ms = merge --skip
mv = mv
p = push
pf = push --force-with-lease
pl = pull
r = reset
rb = rebase
rbc = rebase --continue
rba = rebase --abort
rbs = rebase --skip
rm = rm
s = status
st = stash
sh = show
t = tag
w = whatchanged
ws = status -s
cherrypick = cherry-pick
cherry = cherry-pick
cp = cherry-pick
cpa = cherry-pick --abort
cpc = cherry-pick --continue
cps = cherry-pick --skip
# show commit log of unique commits of this branch (not on master)
diffcommitsfrommaster = log --no-merges master..
# show unified diff of unique commits of this branch
difffrommaster = diff master...
# ^^^^ Holy crap two dots vs three dots, so important. https://stackoverflow.com/a/48681527
[help]
autocorrect = 1
[fetch]
prune = true
# starhive setup
[includeIf "gitdir:~/Projects/starhive/"]
path = ~/Projects/starhive/.gitconfig
# Color set-up
# based on diff-so-fancy's script https://github.com/so-fancy/diff-so-fancy#improved-colors-for-the-highlighted-bits
[color]
ui = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
[color "diff"]
meta = 11
frag = magenta bold
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[init]
defaultBranch = master
[pull]
ff = only
# VSCode as difftool
[diff]
tool = vscode
colorMoved = default
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[difftool]
prompt = false
[merge]
tool = code
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[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