-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
98 lines (76 loc) · 1.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
[alias]
blame = "blame -w -C -C -C"
ca = "commit -am"
cm = "commit -m"
hardupdate = "!git fetch && git reset --hard \"origin/$(git rev-parse --abbrev-ref HEAD)\""
ap = "commit --all --amend --no-edit && git push --force-with-lease"
noedit = "commit -a --amend --no-edit"
cfx = "commit --fixup HEAD~ -m"
pf = "push --force-with-lease"
ri = "rebase --autosquash -i"
ra = "rebase --abort"
rc = "rebase --continue"
st = "status"
stash = "stash --all"
log = -c diff.external=difft log -p --ext-diff
show = show --ext-diff
[branch]
sort = "-committerdate"
[rebase]
autosquash = true
[column]
ui = "auto"
[core]
autocrlf = false
editor = "/usr/bin/env nvim --clean"
[credential]
helper = "store"
[diff]
colorMoved = zebra
colormovedws = "allow-indentation-change"
external = "/usr/bin/env difft --display inline"
; external = "/usr/bin/env difft --color auto --background light --display side-by-side"
[advice]
# warn when ponting to a commit instead of branch
detachedHead = true
addIgnoredFile = false
[difftool]
prompt = false
[difftool "difftastic"]
cmd = difft "$LOCAL" "$REMOTE"
[pager]
difftool = true
[help]
autocorrect = "5"
[merge]
conflictstyle = "zdiff3"
tool = nvimdiff
[pull]
rebase = true
[push]
autoSetupRemote = true
followTags = true
[rerere]
autoUpdate = true
enabled = true
[mergetool]
prompt = false
[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
[url "[email protected]:"]
pushInsteadOf = "https://gist.github.com/"
[url "[email protected]:"]
pushInsteadOf = "https://github.com/"
[url "[email protected]:"]
pushInsteadOf = "https://gitlab.com/"
[user]
name = Orion Gonzalez
email = [email protected]
[includeIf "gitdir:~/work/**"]
path = ~/work/.gitconfig
[maintenance]
repo = /home/ardi/repos/mail
repo = /home/ardi/repos/prust