-
Notifications
You must be signed in to change notification settings - Fork 1
/
Copy pathgitconfig
53 lines (53 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
[user]
name = Bob Nadler
email = [email protected]
[github]
user = bnadlerjr
[core]
autocrlf = false
excludesfile = ~/.gitignore_global
[color]
ui = auto
[alias]
a = add
br = branch
bp = branch-picker
cane = commit --amend --no-edit
ci = commit -v
co = checkout
cob = checkout -b
di = diff
dh = diff HEAD~1
ff = merge --ff-only
glog = log -E -i --grep
lg = log --graph --abbrev-commit --date=relative
olog = log --oneline --
flog = log --format=full
pushf = push --force-with-lease
[fetch]
prune = true
[format]
pretty=format:%C(yellow)%h%Creset -%C(red)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset
[push]
autoSetupRemote = true
default = simple
[rebase]
autosquash = true
[rerere]
enabled = true
[pull]
rebase = true
[init]
defaultBranch = main
[mergetool "neovim"]
cmd = nvim -c \"Gdiffsplit!\" \"$MERGED\"
[mergetool]
keepBackup = false
[merge]
conflictstyle = zdiff3
tool = neovim
[diff]
colorMoved = true
tool = neovim
[difftool "neovim"]
cmd = nvim -d \"$LOCAL\" \"$REMOTE\"