-
Notifications
You must be signed in to change notification settings - Fork 9
/
.gitconfig
129 lines (105 loc) · 2.59 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
[alias]
aa = add --intent-to-add .
b = branch --sort=-committerdate --format='%(HEAD)%(color:yellow)%(refname:short) | %(color:bold green)%(committerdate:relative) | %(color:blue)%(subject)%(color:reset)' --color=always
bs = bisect start --term-new=new --term-old=old
c = commit
ca = !git add --intent-to-add . && git commit -a
co = checkout
cp = cherry-pick
create = create -p
cs = !"git stash save --keep-index; git commit --verbose; git stash pop"
d = diff --color-words --ignore-all-space
dlc = diff --cached HEAD^
dw = diff --color-words --word-diff -w
f = fetch
l = log --abbrev-commit --color --graph --pretty=format:"%Cred%h%Creset\\ -%C(yellow)%d%Creset\\ %s\\ %Cgreen(%cr)%C(bold\\ blue)\\ <%an>%Creset"
m = merge
mypulls = browse -- pulls/adamyonk
new = create -p
pl = pull
ps = push
s = status --branch --short
sa = stash apply
safe = !mkdir -p .git/safe && echo "Repository marked safe!"
shove = push --force-with-lease
show-files = diff-tree --no-commit-id --name-only -r
si = stash save --keep-index
sp = stash pop
standup = log --author=\"Adam Jahnke\" --pretty=oneline --since yesterday
sub = submodule
suba = submodule add
subf = submodule foreach
subu = submodule foreach git pull origin master
who = blame
[branch]
autosetuprebase = always
[credential]
helper = envvar
[color]
branch = auto
diff = auto
status = auto
ui = 1
[commit]
#gpgsign = true
template = ~/.gitmessage
[core]
editor = nvim
excludesfile = ~/.gitignore
; pager = delta
quotepath = false
[delta]
features = line-numbers decorations
syntax-theme = base16
whitespace-error-style = 22 reverse
[delta "decorations"]
commit-decoration-style = bold yellow box ul
file-style = bold yellow ul
file-decoration-style = none
[diff]
algorithm = patience
colorMoved = zebra
; external = difft
[fetch]
prune = true
[gh]
; protocol = https
[github]
user = adamyonk
[gpg]
program = gpg
[help]
autocorrect = 1
[heroku]
account = me
[include]
path = ~/.gitconfig.local
[init]
defaultBranch = main
#templatedir = ~/.git_template
[interactive]
diffFilter = delta --color-only --features=interactive
[merge]
#conflictStyle = diff3
ff = false
[mergetool]
keepbackup = false
[pull]
rebase = true
[push]
default = tracking
followTags = true
autoSetupRemote = true
[rebase]
autoStash = true
autosquash = true
[rerere]
enabled = false
[user]
email = [email protected]
name = Adam Jahnke
[filter "lfs"]
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process