2016-11-19 03:07:49 -05:00
|
|
|
# vim: ft=gitconfig
|
2016-10-02 21:44:37 -04:00
|
|
|
[include]
|
2016-11-19 03:07:49 -05:00
|
|
|
path = tools/kdiff3
|
|
|
|
path = config.os
|
2016-10-03 00:42:18 -04:00
|
|
|
path = config.local
|
2016-10-02 21:44:37 -04:00
|
|
|
|
|
|
|
[alias]
|
2016-10-03 01:09:54 -04:00
|
|
|
co = checkout
|
2016-10-02 21:44:37 -04:00
|
|
|
d = diff
|
2017-10-06 00:09:43 -04:00
|
|
|
l = log --graph --pretty=graph --date=relative
|
2020-02-27 20:20:40 -05:00
|
|
|
up = pull --prune --rebase=preserve --autostash
|
2018-04-18 20:33:00 -04:00
|
|
|
patch = !git --no-pager diff --no-color
|
2016-10-02 21:44:37 -04:00
|
|
|
st = status --short
|
|
|
|
shove = "!f() { git push ${1:-origin} :; }; f"
|
|
|
|
|
2018-04-18 20:33:00 -04:00
|
|
|
[color "diff"]
|
|
|
|
meta = yellow
|
|
|
|
frag = magenta bold
|
|
|
|
commit = yellow bold
|
|
|
|
old = red bold
|
|
|
|
new = green bold
|
|
|
|
whitespace = red reverse
|
|
|
|
|
|
|
|
[color "diff-highlight"]
|
|
|
|
oldNormal = red bold
|
|
|
|
oldHighlight = red bold 52
|
|
|
|
newNormal = green bold
|
|
|
|
newHighlight = green bold 22
|
|
|
|
|
2018-04-18 20:31:09 -04:00
|
|
|
[column]
|
|
|
|
ui = auto
|
|
|
|
|
2018-04-18 20:33:00 -04:00
|
|
|
[core]
|
|
|
|
pager = "diff-so-fancy | less --tabs=4 -RFX"
|
|
|
|
|
2018-04-18 20:31:09 -04:00
|
|
|
[diff]
|
|
|
|
colorMoved = true
|
|
|
|
|
2017-10-06 00:16:46 -04:00
|
|
|
[dude]
|
|
|
|
icon = ~/.config/git-dude/icon.png
|
2016-11-17 17:47:20 -05:00
|
|
|
|
2018-01-24 20:16:39 -05:00
|
|
|
[filter "lfs"]
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
process = git-lfs filter-process
|
|
|
|
required = true
|
|
|
|
|
2017-02-26 21:50:28 -05:00
|
|
|
[gpg]
|
2017-08-09 21:13:58 -04:00
|
|
|
program = gpg-for-git-signing
|
2017-02-26 21:50:28 -05:00
|
|
|
|
2017-10-06 00:16:46 -04:00
|
|
|
[log]
|
|
|
|
decorate = true
|
|
|
|
|
2018-04-18 20:31:09 -04:00
|
|
|
[merge]
|
|
|
|
conflictStyle = diff3
|
|
|
|
|
2017-10-06 00:16:46 -04:00
|
|
|
[pretty]
|
|
|
|
graph = tformat:%C(auto)%h %G? %s% gD% D
|
|
|
|
|
2017-10-06 00:17:48 -04:00
|
|
|
[push]
|
2017-10-06 00:19:22 -04:00
|
|
|
default = simple
|
2017-10-06 00:17:48 -04:00
|
|
|
gpgSign = if-asked
|
|
|
|
|
2016-11-17 17:47:20 -05:00
|
|
|
[rerere]
|
|
|
|
enabled = true
|
2017-08-17 02:16:32 -04:00
|
|
|
|
2018-04-18 20:31:09 -04:00
|
|
|
[status]
|
|
|
|
branch = true
|
|
|
|
|
2019-11-17 19:30:16 -05:00
|
|
|
[submodule]
|
|
|
|
recurse = true
|
|
|
|
|
2017-10-06 00:16:46 -04:00
|
|
|
[url "git@github.com:"]
|
|
|
|
pushInsteadOf = https://github.com/
|
|
|
|
|
|
|
|
[user]
|
|
|
|
name = Danielle McLean
|
|
|
|
email = dani@00dani.me
|