dotfiles/apps/git/config

[push]
	default = current

[user]
	name = Daniel Flanagan
	email = daniel@lyte.dev

[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]
	a = add
	A = add
	b = rev-parse --symbolic-full-name HEAD
	c = commit
	cm = commit -m
	cnv = commit --no-verify
	co = checkout
	d = diff
	ds = diff --staged
	dt = difftool
	l = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short
	ls = ls-files
	mm = merge master
	p = push
	pf = push --force-with-lease
	pl = pull
	rim = rebase -i master
	s = status
	sur = submodule update --remote

[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 = 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'

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

[commit]
	gpgsign = true

[gpg]
	program = gpg2

[include]
	path = $ENV_PATH/gitconfig
[color]
	ui = auto
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`
Wayland fixes and gitconfig 2020-04-07 11:12:33 -05:00			`email = daniel@lyte.dev`
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]`
Lots of big changes that I should really write a good commit message for 2020-11-17 17:17:03 -06:00			`a = add`
			`A = add`
			`b = rev-parse --symbolic-full-name HEAD`
			`c = commit`
			`cm = commit -m`
			`cnv = commit --no-verify`
Add some alises 2019-08-10 21:40:35 -05:00			`co = checkout`
Lots of big changes that I should really write a good commit message for 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`
Add some alises 2019-08-10 21:40:35 -05:00			`mm = merge master`
			`p = push`
			`pf = push --force-with-lease`
Lots of big changes that I should really write a good commit message for 2020-11-17 17:17:03 -06:00			`pl = pull`
			`rim = rebase -i master`
			`s = status`
			`sur = submodule update --remote`
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`
Lots of small fixes back in arch 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'`
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`
Per-environment commit signing 2020-02-13 16:29:47 -06:00
			`[include]`
			`path = $ENV_PATH/gitconfig`
Fix archupdate 2020-09-10 20:00:17 -05:00			`[color]`
			`ui = auto`