-
Notifications
You must be signed in to change notification settings - Fork 0
/
gitconfig
55 lines (54 loc) · 1.11 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
[core]
editor = nvim
excludesfile = /Users/chrisnicola/.gitignore
ignorecase = false
[user]
name = Chris Nicola
email = [email protected]
[color]
diff = auto
ui = auto
branch = auto
status = auto
[push]
default = tracking
[pull]
rebase = true
[branch]
autosetuprebase = always
[alias]
st = status
ps = push
pu = pull
ci = commit -v
br = branch
co = checkout
cp = cherry-pick
cia = commit -v -a
cam = commit -v -a -am
df = diff
dfr = diff -R
lg = log -p
rb = rebase
spull = !git svn fetch && git svn rebase
spush = !git svn dcommit
gr = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
ada = add -A .
[diff]
renames = true
tool = nvimdiff
[difftool]
prompt = false
[difftool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[merge]
tool = nvimdiff
[mergetool]
prompt = false
keepBackup = false
[mergetool "nvimdiff"]
cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[github]
user = chrisnicola
[rerere]
enabled = true