-
Notifications
You must be signed in to change notification settings - Fork 1
/
gitconfig.erb
110 lines (110 loc) · 2.73 KB
/
gitconfig.erb
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
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
[user]
name = Chris Hoffman
email = cehoffman@gmail.com
useConfigOnly = true
signingkey = 0xB7490129ADEDFE08
[color]
ui = auto
[sendemail]
smtpuser = cehoffman
smtpserver = smtp.gmail.com
chainreplyto = false
smptencryption = tls
[alias]
co = checkout
reup = pull --rebase
st = status --ignore-submodules=untracked -sb
d = diff --ignore-submodules=untracked --ignore-space-at-eol
dc = diff --cached --ignore-submodules=untracked --ignore-space-at-eol
l = log --graph --stat --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset [%an]: %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
l1 = l -1
ci = commit
cp = cherry-pick
br = branch
patch = diff --no-pager --no-color
unstage = reset HEAD --
amend = commit --amend -C HEAD
prune-all = !git remote | xargs -n 1 git remote prune
tidy = !git branch --merged "${1-master}" | egrep -v '(^\\*|master)' | xargs -r git branch -d
tidyn = !git branch --merged "${1-master}" | egrep -v '(^\\*|master)' | xargs -r echo
subup = !git submodule foreach 'git co master && git reup'
root = !pwd
remotes = remote -v
[core]
eol = lf
compression = 9
pager = less
whitespace = trailing-space,space-before-tab,-blank-at-eof
preloadindex = true
[pager]
diff = diff-so-fancy | less --tabs=4 -RFXS --pattern '^(Date|added|deleted|modified): '
[apply]
whitespace = fix
[merge]
conflictstyle = merge
tool = splice
[mergetool]
keepBackup = false
[mergetool "mvimdiff3"]
cmd = mvim -f -c \"Gdiff\" \"$MERGED\"
trustExitCode = false
[mergetool "splice"]
cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
trustExitCode = true
[github]
user = cehoffman
[clean]
requireForce = no
[status]
submodulesummary = true
showUntrackedFiles = all
[fetch]
recurseSubmodules = on-demand
writeCommitGraph = true
[column]
ui = auto
[format]
pretty = %C(yellow)%h%Creset %s %C(red)(%cr)%Creset
[rerere]
enabled = 1
[branch]
sort = -committerdate
[help]
autocorrect = 1
[push]
default = upstream
recurseSubmodules = on-demand
[interactive]
singlekey = true
diffFilter = diff-so-fancy --patch
[credential]
<%- if mac? %> helper = osxkeychain<% end %>
[pull]
rebase = true
[color "diff-highlight"]
oldNormal = red bold
oldHighlight = red bold 52
newNormal = green bold
newHighlight = green bold 22
meta = 11
frag = magenta bold
func = 146 bold
commit = yellow bold
old = red bold
new = green bold
whitespace = red reverse
[commit]
gpgsign = <%= mac?.to_s %>
[diff]
renameLimit = 5000
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[protocol]
version = 2
[init]
defaultBranch = master
[url "ssh://git@gitlab.com/"]
insteadOf = https://gitlab.com/