forked from sheenjustin/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
46 lines (46 loc) · 1.08 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
[user]
email = [email protected]
name = Sheen Justin
[core]
editor = vim
autocrlf = false
preloadIndex = true
[merge]
tool = vscode
[mergetool "vscode"]
cmd = code --wait $MERGED
[diff]
tool = vscode
[difftool "vscode"]
cmd = code --wait --diff $LOCAL $REMOTE
[alias]
st = status
co = checkout
ci = commit
br = branch
nb = checkout -b
p = !git push -u origin $(git rev-parse --abbrev-ref HEAD)
last = log -1 HEAD
cm = commit -m
cma = commit -a -m
rb = rebase --interactive origin/staging
dev = checkout development
staging = checkout staging
lg = log --graph --pretty=format:'%Cred%h %Cblue%an%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
[pull]
rebase = true
[help]
autocorrect = 1
[fetch]
prune = true
[core]
pager = delta
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
#light = false # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)
[merge]
conflictStyle = zdiff3
[diff]
colorMoved = default