2017-02-28 10:56:23 -06:00
|
|
|
[push]
|
2019-02-04 09:57:54 -06:00
|
|
|
default = current
|
2017-02-28 10:56:23 -06:00
|
|
|
|
|
|
|
[user]
|
|
|
|
name = Daniel Flanagan
|
2020-04-07 11:12:33 -05:00
|
|
|
email = daniel@lyte.dev
|
2017-02-28 10:56:23 -06:00
|
|
|
|
2019-02-04 09:57:54 -06:00
|
|
|
[filter "lfs"]
|
|
|
|
clean = git-lfs clean -- %f
|
|
|
|
smudge = git-lfs smudge -- %f
|
|
|
|
process = git-lfs filter-process
|
|
|
|
required = true
|
|
|
|
|
2017-02-28 10:56:23 -06:00
|
|
|
[core]
|
|
|
|
editor = nvim
|
|
|
|
|
|
|
|
[http "https://gopkg.in"]
|
|
|
|
followRedirects = true
|
2018-11-08 13:06:32 -06:00
|
|
|
|
2017-03-21 19:04:13 -05:00
|
|
|
[diff]
|
2020-02-12 11:13:46 -06:00
|
|
|
tool = nvimdiff
|
2018-11-08 13:06:32 -06:00
|
|
|
|
2017-03-21 19:04:13 -05:00
|
|
|
[difftool]
|
|
|
|
prompt = false
|
2018-11-08 13:06:32 -06:00
|
|
|
|
2017-03-21 19:04:13 -05:00
|
|
|
[alias]
|
2020-11-17 17:17:03 -06:00
|
|
|
a = add
|
2020-11-17 17:18:00 -06:00
|
|
|
A = add -A
|
|
|
|
ac = commit -a
|
2020-11-17 17:17:03 -06:00
|
|
|
b = rev-parse --symbolic-full-name HEAD
|
|
|
|
c = commit
|
|
|
|
cm = commit -m
|
|
|
|
cnv = commit --no-verify
|
2019-08-10 21:40:35 -05:00
|
|
|
co = checkout
|
2020-11-17 17:17:03 -06:00
|
|
|
d = diff
|
|
|
|
ds = diff --staged
|
|
|
|
dt = difftool
|
|
|
|
l = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short
|
|
|
|
ls = ls-files
|
2019-08-10 21:40:35 -05:00
|
|
|
mm = merge master
|
|
|
|
p = push
|
|
|
|
pf = push --force-with-lease
|
2020-11-17 17:17:03 -06:00
|
|
|
pl = pull
|
|
|
|
rim = rebase -i master
|
|
|
|
s = status
|
|
|
|
sur = submodule update --remote
|
2018-11-08 13:06:32 -06:00
|
|
|
|
2018-10-19 01:17:08 -05:00
|
|
|
[merge]
|
2018-11-08 13:06:32 -06:00
|
|
|
tool = nvimdiff
|
2018-10-19 01:17:08 -05:00
|
|
|
conflictstyle = diff3
|
2018-11-08 13:06:32 -06:00
|
|
|
|
2018-10-19 01:17:08 -05:00
|
|
|
[mergetool]
|
|
|
|
prompt = false
|
2018-11-08 13:06:32 -06:00
|
|
|
|
|
|
|
[mergetool "nvimdiff"]
|
2020-02-12 09:46:01 -06:00
|
|
|
cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'
|
|
|
|
|
2019-02-04 01:43:53 -06:00
|
|
|
[pager]
|
|
|
|
branch = false
|
2020-01-20 14:28:45 -06:00
|
|
|
# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
|
2020-11-06 09:31:50 -06:00
|
|
|
diff = nvim -c 'silent %sm/\\e[^mK]*[mK]//g' \
|
|
|
|
-c 'silent %s/^diff/\\r\\rdiff/' \
|
|
|
|
-c 'silent set ft=diff' \
|
|
|
|
-c 'silent execute \"normal gg2dd\"' \
|
|
|
|
-c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile'
|
2019-06-25 15:57:42 -05:00
|
|
|
|
2019-11-01 20:28:53 -05:00
|
|
|
[url "git@github.com:postmates"]
|
|
|
|
insteadOf = https://github.com/postmates
|
2020-01-20 14:28:45 -06:00
|
|
|
|
2020-01-08 10:59:45 -06:00
|
|
|
[commit]
|
|
|
|
gpgsign = true
|
2020-01-20 14:28:45 -06:00
|
|
|
|
2020-01-08 10:59:45 -06:00
|
|
|
[gpg]
|
|
|
|
program = gpg2
|
2020-02-13 16:29:47 -06:00
|
|
|
|
|
|
|
[include]
|
|
|
|
path = $ENV_PATH/gitconfig
|
2020-09-10 20:00:17 -05:00
|
|
|
[color]
|
|
|
|
ui = auto
|