-
Notifications
You must be signed in to change notification settings - Fork 0
/
.gitconfig
46 lines (39 loc) · 965 Bytes
/
.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
[user]
name = Joseph Cagle
email = [email protected]
[init]
defaultBranch = master
[core]
editor = vim
autocrlf = input
whitespace = -blank-at-eof,blank-at-eol,space-before-tab
[alias]
prettylog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset'
[pull]
ff = only
[merge]
ff = only
conflictstyle = diff3
; TO DO
; gpgSign = true
; (also gpg-agent)
[push]
default = simple
followTags = true
[transfer]
fsckobjects = true
[status]
showUntrackedFiles = all
; some stuff copied from https://blog.scottnonnenberg.com/better-git-configuration/
; TO DO
[diff]
; tool = icdiff
[difftool]
; prompt = false
[difftool "icdiff"]
; cmd = /usr/local/bin/icdiff --line-numbers $LOCAL $REMOTE
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true