forked from jimlawton/dotfiles
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgitconfig
More file actions
217 lines (217 loc) · 7.33 KB
/
gitconfig
File metadata and controls
217 lines (217 loc) · 7.33 KB
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
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
[user]
name = Ralph Depping
email = ralph.depping@forcepoint.com
[core]
safecrlf = warn
deltaBaseCacheLimit = 1G
excludesfile = ~/.gitignore
quotepath = false
editor = vim
pager = cat
[push]
default = upstream
recurseSubmodules = check
[branch "master"]
rebase = false
autosetuprebase = never
[branch]
autosetuprebase = never
[status]
displaycommentprefix = false
[rebase]
stat = true
[hub]
protocol = https
[color]
ui = auto
# diff = auto
# status = auto
# branch = auto
[color "branch"]
#current = yellow reverse
#local = yellow
#remote = green
[color "diff"]
#meta = yellow bold
#frag = magenta bold
#old = red bold
#new = green bold
[color "status"]
#added = yellow
#changed = green
#untracked = cyan
[apply]
whitespace = nowarn
[rerere]
enabled = true
[diff]
tool = bc3
algorithm = patience
[difftool]
prompt = false
[merge]
tool = bc3
[mergetool]
prompt = false
keepBackup = false
bc3 = trustExitCode
[url "git://github.com/"]
insteadOf = "ghg://"
pushInsteadOf = "ghg://"
# Example: git clone ghg://ntschutta/emacs
[url "git@github.com:"]
insteadOf = "ghs://"
pushInsteadOf = "ghs://"
[url "git@github.com:rdepping/"]
insteadOf = "ghsm://"
pushInsteadOf = "ghsm://"
[url "https://github.com/"]
insteadOf = "ghh://"
pushInsteadOf = "ghh://"
[url "https://github.com/rdepping/"]
insteadOf = "ghhm://"
pushInsteadOf = "ghhm://"
[http]
# proxy=http://something
[github]
user = rdepping
#token = PLACEHOLDER
[hub]
protocol = https
[gist]
private = yes
browse = yes
[alias]
abbr = "!sh -c 'git rev-list --all | grep ^$1 | while read commit; do git --no-pager log -n1 --pretty=format:\"%H %ci %an %s%n\" $commit; done' -"
aliases = !git config --get-regexp 'alias.*' | colrm 1 6 | sed 's/[ ]/ = /'
blg = log --graph --decorate --all --abbrev-commit --pretty=oneline
br = branch
busypeople = shortlog -6
busythisweek = shortlog --since=one.week.ago
cam = commit -a -m
c = commit
ci = commit
cl = log --stat -C -2
cob = checkout -b
co = checkout
configpushcurrent = config push.default current
configpushnothing = config push.default nothing
configpushtracking = config push.default matching
configpushtracking = config push.default tracking
configsimplelog = config format.pretty oneline
dc = diff --staged
dcw = diff --color-words
d = diff --color-words
dh = diff HEAD
dump = cat-file -p
dw = diff --word-diff
empty-tree-sha1 = hash-object -t tree /dev/null
fetchnotes = !sh -c 'git fetch $1 refs/notes/*:refs/notes/*' -
fixup = "!sh -c 'git commit -m \"fixup! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
gc-ap = gc --aggressive --prune
graphviz = "!f() { echo 'digraph git {' ; git log --pretty='format: %h -> { %p }' \"$@\" | sed 's/[0-9a-f][0-9a-f]*/\"&\"/g' ; echo '}'; }; f"
gwcl = log --graph --all --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
hse = log --stat -5
ignorechanges = update-index --assume-unchanged
ignored = ls-files --others --i --exclude-standard
k = !exec gitk --all&
last = log -1 HEAD
latest-branches = for-each-ref --count=30 --sort=-committerdate refs/heads/ --format='%(refname:short)'
lf = log --pretty=fuller
lg = log --oneline --graph --decorate --pretty=format:'%C(auto)%h%Creset %C(auto)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset' --abbrev-commit --date=relative
lgorigin = log --oneline --graph --decorate origin/master...master --left-right
lgso = log --graph --date=short --pretty=format:'%C(yellow)%h%Creset %cn%x09%cd %s%C(green bold)%d'
listconf = config --global --list
listhistory = log --name-status
liststaged = diff --name-status --staged
listunstaged = diff --name-status
ll = log --stat -C -3
lm = log --stat -M
lod = log --oneline --decorate
logcpy = log --stat -1 -C -C
logfive = log --graph --pretty=oneline --abbrev-commit --decorate --all -5
logit = log --stat -M
logme = log --author=Depping --stat -C
logm = log --stat -M
logn = log --oneline --name-only
logr2 = log --stat -M -2
logr = log -M
logsimple = log --graph --abbrev-commit --pretty=oneline --all --decorate
lol = log --pretty=oneline --graph --abbrev-commit --all
lp = log -p
lpo = log --pretty=oneline --abbrev-commit --graph --decorate --all
lsm = log -M --stat
lwr = log --stat -C
mergekeepoursonly = merge -s ours
nfjsunpushed = log origin/master..master --oneline
noderelnotes = git log --graph --pretty=format:'%h%d %s (%an)'
noticechanges = update-index --no-assume-unchanged
nr = "!sh -c 'git init $0'"
oneline ="!_() { $(test $# -eq 0 && echo xargs -L1) git log --no-walk --decorate --oneline \"$@\"; }; _"
orphank = !gitk --all `git reflog | cut -c1-7`&
orphanl = !git log --pretty=oneline --abbrev-commit --graph --decorate `git reflog | cut -c1-7`
patchforthis = "!git diff -p $(git empty-tree-sha1)"
ph = push
pl = pull
prunenow = gc --prune=now
pubdev = !git pub checkout master && git pull && git checkout dev && git rebase master && git checkout master && git merge dev && git wtf
pub = push -u origin
purgeme = !git clean -fd && git reset --hard
pur = pull --rebase
pushnotes = !sh -c 'git push $1 refs/notes/*' -
ready = rebase -i @{u}
redocommit = reset --soft HEAD^
ri = rebase --interactive --autosquash
rlog = log --color-words --stat -3
rmmissing = !git rm $(git ls-files --deleted)
ro = !git fetch origin && git reset --hard origin/master
rtheirs = !git checkout --theirs ./ && git add . && git rebase --continue
rv = remote -v
scrub = !git reset --hard && git clean -fd
servehere = daemon --verbose --informative-errors --reuseaddr --export-all --base-path=. --enable=receive-pack
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
showignored2 = ls-files --others --ignored --exclude-standard
showignored = clean -ndX
showuntracked = ls-files --others --exclude-standard
slog = log --graph --simplify-by-decoration --all --abbrev-commit --pretty=oneline
sno = show --name-only
squash = "!sh -c 'git commit -m \"squash! $(git log -1 --format='\\''%s'\\'' $@)\"' -"
s = status -u -s
standup = log --all --since yesterday --author ralph.depping@forcepoint.com
stat = status
st = status
sync = !git pull && git push
tagcontains = git tag -l --contains HEAD
tips = "!_() { t=$(git rev-list --no-merges --max-count=1 \"$@\"); if test -n \"$t\"; then echo $t; _ \"$@\" ^$t; fi; }; _"
type = cat-file -t
weekly = !git --no-pager log --author=\"`git config --global user.name`\" --since='2 sunday ago' --until='1 sunday ago' --format='%Cgreen%ci%Creset %s%Creset'
whatis = show -s --pretty='tformat:%h (%s, %ad)' --date=short
whitespaceviolations = "!git diff --check $(git empty-tree-sha1)"
who = shortlog -s --
wipe = reset --hard HEAD
url = !git info | grep ^remote | grep \\.url | awk -F= \"{print $2}\"
[http]
sslVerify = false
postBuffer = 524288000
[diff "nodiff"]
command = /bin/true
[credential]
helper = osxkeychain
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
required = true
process = git-lfs filter-process
[difftool "sourcetree"]
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
path =
[mergetool "sourcetree"]
cmd = /Users/ralph.depping/Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
trustExitCode = true
[difftool "bc3"]
trustExitCode = true
[mergetool "bc3"]
trustExitCode = true
[commit]
template = .gitcommitmessage