-
Notifications
You must be signed in to change notification settings - Fork 2
/
gitconfig
67 lines (53 loc) · 1.54 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
[push]
default = current
[alias]
co = checkout
ci = commit -v
st = status
br = branch
up = pull --rebase
put = push origin HEAD
ds = diff --staged
undo = reset --soft HEAD^
ls = log --pretty=format':%C(yellow)%h %C(blue)%ad%C(red)%d %C(reset)%s%C(green) [%cn]' --decorate --date=short
graph = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
url =! bash -c 'git config --get remote.origin.url | sed -E "s/.+:\\(.+\\)\\.git$/https:\\\\/\\\\/github\\\\.com\\\\/\\\\1/g"'
ltag =! bash -c 'git tag -l | sort -V | tail -1'
lp = log -p
set-upstream = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
[core]
excludesfile = ~/.gitignore_global
autocrlf = input
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)
[diff]
colorMoved = default
[apply]
whitespace = nowarn
[merge]
tool = vimdiff
ff = only
conflictstyle = diff3
[mergetool]
keepBackup = false
prompt = false
[mergetool "vimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[difftool]
prompt = false
[fetch]
prune = true
[include]
path = .gitconfig.local
[init]
templatedir = ~/.git_template
# onedark theme
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22