dotfiles/apps/git/config

[push]
	default = current

[user]
	name = Daniel Flanagan
	email = daniel@lytedev.io
	signingkey = daniel@lytedev.io

[filter "lfs"]
	clean = git-lfs clean -- %f
	smudge = git-lfs smudge -- %f
	process = git-lfs filter-process
	required = true

[core]
	editor = nvim

[http "https://gopkg.in"]
	followRedirects = true

[diff]
	tool = nvimdiff

[difftool]
	prompt = false

[alias]
	d = difftool
	s = status
	co = checkout
	mm = merge master
	rim = rebase -i master
	b = rev-parse --symbolic-full-name HEAD
	p = push
	pl = pull
	pf = push --force-with-lease
	a = add -A
	cnv = commit --no-verify
	canv = commit --no-verify
	c = commit

[merge]
	tool = nvimdiff
	conflictstyle = diff3

[mergetool]
	prompt = false

[mergetool "nvimdiff"]
	cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'

[pager]
	branch = false
	# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding
	diff = vimpager -c 'silent %sm/\\e[^mK]*[mK]//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent execute \"normal gg2dd\"'

[url "git@github.com:postmates"]
	insteadOf = https://github.com/postmates

[commit]
	gpgsign = true

[gpg]
	program = gpg2
add git config, changed some vim config stuff, other de changes 2017-02-28 10:56:23 -06:00			`[push]`
Implement changes from work machine 2019-02-04 09:57:54 -06:00			`default = current`
add git config, changed some vim config stuff, other de changes 2017-02-28 10:56:23 -06:00
			`[user]`
			`name = Daniel Flanagan`
Fix git config 2019-03-13 09:35:04 -05:00			`email = daniel@lytedev.io`
Testing signed commits 2020-01-08 10:59:45 -06:00			`signingkey = daniel@lytedev.io`
add git config, changed some vim config stuff, other de changes 2017-02-28 10:56:23 -06:00
Implement changes from work machine 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`

add git config, changed some vim config stuff, other de changes 2017-02-28 10:56:23 -06:00			`[core]`
			`editor = nvim`

			`[http "https://gopkg.in"]`
			`followRedirects = true`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00
Add some git config stuff and a git plugin for vim 2017-03-21 19:04:13 -05:00			`[diff]`
Suepr vim diff viewer! 2020-02-12 11:13:46 -06:00			`tool = nvimdiff`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00
Add some git config stuff and a git plugin for vim 2017-03-21 19:04:13 -05:00			`[difftool]`
			`prompt = false`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00
Add some git config stuff and a git plugin for vim 2017-03-21 19:04:13 -05:00			`[alias]`
			`d = difftool`
Add some alises 2019-08-10 21:40:35 -05:00			`s = status`
			`co = checkout`
			`mm = merge master`
			`rim = rebase -i master`
			`b = rev-parse --symbolic-full-name HEAD`
			`p = push`
			`pl = pull`
			`pf = push --force-with-lease`
Some things - moonscript for shell scripting is pretty neat 2019-11-12 11:06:20 -06:00			`a = add -A`
A return to the days of old 2019-11-28 08:22:41 -06:00			`cnv = commit --no-verify`
Fix notes and add vim pager 2020-01-20 14:28:45 -06:00			`canv = commit --no-verify`
A return to the days of old 2019-11-28 08:22:41 -06:00			`c = commit`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00
Fix a few things * vim as git difftool * don't use ale completion (we use deoplete) * normal Iosevka font * fix a var name collision * rename home directory to `.home` to hide better * fix warning with `c` function for going to $NICE_HOME * improve fsw command 2018-10-19 01:17:08 -05:00			`[merge]`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00			`tool = nvimdiff`
Fix a few things * vim as git difftool * don't use ale completion (we use deoplete) * normal Iosevka font * fix a var name collision * rename home directory to `.home` to hide better * fix warning with `c` function for going to $NICE_HOME * improve fsw command 2018-10-19 01:17:08 -05:00			`conflictstyle = diff3`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00
Fix a few things * vim as git difftool * don't use ale completion (we use deoplete) * normal Iosevka font * fix a var name collision * rename home directory to `.home` to hide better * fix warning with `c` function for going to $NICE_HOME * improve fsw command 2018-10-19 01:17:08 -05:00			`[mergetool]`
			`prompt = false`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00
			`[mergetool "nvimdiff"]`
WIP 2020-02-12 09:46:01 -06:00			`cmd = nvimdiff $BASE $LOCAL $REMOTE $MERGED -c '$wincmd w' -c '$wincmd J'`

Clean up some git and vim cruft 2019-02-04 01:43:53 -06:00			`[pager]`
			`branch = false`
Fix notes and add vim pager 2020-01-20 14:28:45 -06:00			`# remove ansi codes, pad each file's diff with newlines, show as diff, remove top padding`
Suepr vim diff viewer! 2020-02-12 11:13:46 -06:00			`diff = vimpager -c 'silent %sm/\\e[^mK]*[mK]//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent execute \"normal gg2dd\"'`
Checking on coc.vim 2019-06-25 15:57:42 -05:00
Posties 2019-11-01 20:28:53 -05:00			`[url "git@github.com:postmates"]`
			`insteadOf = https://github.com/postmates`
Fix notes and add vim pager 2020-01-20 14:28:45 -06:00
Testing signed commits 2020-01-08 10:59:45 -06:00			`[commit]`
			`gpgsign = true`
Fix notes and add vim pager 2020-01-20 14:28:45 -06:00
Testing signed commits 2020-01-08 10:59:45 -06:00			`[gpg]`
			`program = gpg2`