-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
88 lines (87 loc) · 2.45 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
[user]
name = Austin Gill
email = [email protected]
[core]
editor = vim
fileMode = false
eol = lf
autocrlf = input
# pager = perl /usr/share/doc/git/contrib/diff-highlight/diff-highlight | less
pager = delta
excludesFile = ~/.gitignore
[color]
status = true
[color "status"]
branch = bold blue
unmerged = magenta
[interactive]
diffFilter = delta --color-only
[delta]
line-numbers = true
syntax-theme = base16
# side-by-side diffs are nice, but utilize __delta_side_by_side_width to enable/disable them
# based on the current terminal width.
#side-by-side = true
[merge]
tool = code
# zdiff3 is too new for my work system
conflictstyle = diff3
algorithm = histogram
[mergetool "code"]
cmd = code --wait --merge $REMOTE $LOCAL $BASE $MERGED
[rebase]
autosquash = true
updaterefs = true
[diff]
tool = code
submodule=log
[status]
submodulesummary = true
[difftool "code"]
cmd = code --wait --diff $LOCAL $REMOTE
[commit]
# commit -v by default
verbose = true
[credential]
helper = cache
help = cache --timeout=60000
[alias]
lg = log --color --graph --pretty=format:'%C(auto)%h%d %s %C(black)%C(bold)%an, %ar' --abbrev-commit --decorate
ll = log --pretty=format:'%C(red)%h%C(reset) -%C(yellow)%d%C(reset) %s %C(bold blue) <%an>' --decorate --numstat --abbrev-commit
rf = reflog --pretty=format:'%C(auto)%h %gd %gs%C(black)%C(bold), %cr'
co = checkout
sw = switch
amend = commit --amend --no-edit
st = status
b = branch -vv
rb = rebase
chp = cherry-pick
cor = checkout --recurse-submodules
yolo = !git commit -am \"$(curl -s https://whatthecommit.com/index.txt)\"
rekt = reset HEAD~ --hard
dt = difftool
mt = mergetool
[push]
default = simple
autoSetupRemote = true
[pull]
rebase = true
[fetch]
prune = true
[rerere]
enabled = true
[branch]
sort = -committerdate
[blame]
# git-blame fails if this file doesn't exist, and it's too painful to auto-create it if it
# doesn't exist (See: https://github.com/Notgnoshi/dotfiles/issues/123). So disable it by
# default.
# ignoreRevsFile = .git-blame-ignore-revs
markIgnoredLines = true
markUnblamableLines = true
[includeIf "gitdir:~/swdev/"]
path = .gitconfig-work
[includeIf "gitdir:~/workspace/"]
path = .gitconfig-work
[includeIf "gitdir:~/work/"]
path = .gitconfig-work