-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
52 lines (41 loc) · 1023 Bytes
/
.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
[user]
name = Zane Duffield
email = [email protected]
[init]
defaultBranch = main
[alias]
b = branch
c = checkout
cp = cherry-pick
s = status
dirdiff = difftool --dir-diff
dirshow = "!f(){ git dirdiff \"${1-HEAD}~\" \"${1-HEAD}\"; }; f"
basediff = "! git difftool \"$(git merge-base \"$(git rev-parse --abbrev-ref origin/HEAD)\" HEAD)\""
merge-ours = merge -s recursive -Xours
fpwl = push --force-with-lease
yolo = "!f(){ git commit -a -m \"$(curl http://whatthecommit.com/index.txt 2>/dev/null)\" }; f"
[core]
autocrlf = false
longpaths = true
editor = vim
pager = delta
# fsmonitor gives me grief on Linux
# fsmonitor = true
[advice]
detachedHead = false
[rebase]
autosquash = true
[branch]
autosetuprebase = always
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
# side-by-side = true
[merge]
conflictstyle = diff3
ff = only
[diff]
colorMoved = default
[include]
path = ~/.gitconfig.local