-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy path.gitconfig
40 lines (37 loc) · 1.05 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
[core]
excludesfile = ~/.gitignore_global
# Checkout Windows-style, commit Unix-style (core.autocrlf = true)
# Checkout as-is, commit Unix-style (core.autocrlf = input)
# Checkout as-is, commit as-is (core.autocrlf = false)
autocrlf = false
# Have diff and other tools not see CR characters as a difference. I.e. no
# more ^M characters in diffs
whitespace = cr-at-eol
[merge]
tool = vimdiff
prompt = false
[mergetool "vimdiff"]
cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'
[diff]
tool = vimdiff
prompt = false
[difftool "vimdiff"]
cmd = nvim -d $LOCAL $REMOTE -c '$wincmd w' -c 'wincmd J'
[format]
pretty = %C(yellow)%h%x09%Creset%Cgreen(%cr)%x09%C(blue)<%an>%x09%Creset%Creset %Cred%d%Creset %s
[alias]
l = "log --graph"
ll = "!source ~/.githelpers && pretty_git_log"
[filter "lfs"]
required = true
clean = git-lfs clean %f
smudge = git-lfs smudge %f
[push]
default = simple
[user]
name = Adam George
email = [email protected]
[credential]
helper = osxkeychain
[credential "https://github.com"]
username = asgeo1