dotfiles/apps/git/config

[push]
	default = current

[user]
	name = Daniel Flanagan
	email = 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
	pager = less -r

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

[diff]
	tool = nvimdiff

[difftool]
	prompt = false

[alias]
	d = difftool

[merge]
	tool = nvimdiff
	conflictstyle = diff3

[mergetool]
	prompt = false

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

[pager]
	branch = false
	diff = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' -
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`
			`email = daniel@lytedev.io`

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`
Clean up some git and vim cruft 2019-02-04 01:43:53 -06:00			`pager = less -r`
add git config, changed some vim config stuff, other de changes 2017-02-28 10:56:23 -06:00
			`[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]`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -06:00			`tool = nvimdiff`

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`
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"]`
Push current 2019-01-30 14:24:05 -06:00			`cmd = nvim -d $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`
			`diff = nvim -c 'silent %sm/\\e.\\{-}m//g' -c 'silent %s/^diff/\\r\\rdiff/' -c 'silent set ft=diff' -c 'silent setlocal nobuflisted buftype=nofile bufhidden=wipe noswapfile' -c 'goto 1' -`