dotfiles/common/git/config

[user]
	name = Daniel Flanagan

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

[core]
	editor = $EDITOR
	pager = delta
	excludesfile = /home/daniel/.home/.gitignore

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

[diff]
	colorMoved = default

[difftool]
	prompt = false

[alias]
	a = add
	A = add -A
	ac = commit -a
	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
	f = fetch
	l = log --graph --abbrev-commit --decorate --oneline --all
	plainlog = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate
	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

[pull]
	default = current

[merge]
	conflictstyle = diff3

[gpg]
	program = gpg2

[color]
	ui = auto

[push]
	default = current
	autoSetupRemote = true

[sendemail]
	smtpserver = smtp.mailgun.org
	smtpuser = daniel@lyte.dev
	smtrpencryption = tls
	smtpserverport = 587

[include]
	path = ~/.config/lytedev-env/host-layer-personal/gitconfig
	path = ~/.config/lytedev-env/divvy/gitconfig

[branch]
	autoSetupMerge = true

# [push]
# 	pushOption = merge_request.create
# 	pushOption = merge_request.remove_source_branch 
# 	pushOption = merge_request.assign="daniel.flanagan" 

[url "git@git.hq.bill.com:"]
	insteadOf = https://git.hq.bill.com/
add git config, changed some vim config stuff, other de changes 2017-02-28 10:56:23 -06:00			`[user]`
			`name = Daniel Flanagan`

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]`
Finally get multiple gitconfigs layering 2021-11-09 09:11:40 -06:00			`editor = $EDITOR`
Use delta for diff viewing 2022-10-20 20:53:16 -05:00			`pager = delta`
Add global gitignore and remove mouse accel 2021-03-10 15:56:59 -06:00			`excludesfile = /home/daniel/.home/.gitignore`
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]`
Use delta for diff viewing 2022-10-20 20:53:16 -05:00			`colorMoved = default`
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`
Fix ac git alias 2020-11-17 17:18:00 -06:00			`A = add -A`
			`ac = commit -a`
Lots of big changes that I should really write a good commit message for 2020-11-17 17:17:03 -06:00			`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`
Lots of small fixes I've forgotten to commit 2021-04-14 14:53:02 -05:00			`f = fetch`
Finally get multiple gitconfigs layering 2021-11-09 09:11:40 -06:00			`l = log --graph --abbrev-commit --decorate --oneline --all`
			`plainlog = log --pretty=format:'%h %ad%x09%an%x09%s' --date=short --decorate`
Lots of big changes that I should really write a good commit message for 2020-11-17 17:17:03 -06:00			`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
Changes 2022-05-25 11:38:52 -05:00			`[pull]`
			`default = current`

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]`
			`conflictstyle = diff3`
Improve gitconfig, update dunst configuration 2018-11-08 13:06:32 -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
Fix archupdate 2020-09-10 20:00:17 -05:00			`[color]`
			`ui = auto`
Add neovim credential helper 2021-01-06 10:52:25 -06:00
Stuff? 2021-09-24 13:06:43 -05:00			`[push]`
			`default = current`
Terminal -> tmux startup improvements, steam deck mode, field takes awk options 2023-01-13 10:53:17 -06:00			`autoSetupRemote = true`
Finally get multiple gitconfigs layering 2021-11-09 09:11:40 -06:00
Add XDG_DATA_HOME 2022-02-07 15:20:19 -06:00			`[sendemail]`
			`smtpserver = smtp.mailgun.org`
			`smtpuser = daniel@lyte.dev`
			`smtrpencryption = tls`
			`smtpserverport = 587`

Finally get multiple gitconfigs layering 2021-11-09 09:11:40 -06:00			`[include]`
Fix tmux env not propogating DISPLAY vars 2021-11-24 09:36:02 -06:00			`path = ~/.config/lytedev-env/host-layer-personal/gitconfig`
Finally get multiple gitconfigs layering 2021-11-09 09:11:40 -06:00			`path = ~/.config/lytedev-env/divvy/gitconfig`
Add pushoption example 2022-05-10 23:19:42 -05:00
Changes 2022-05-25 11:38:52 -05:00			`[branch]`
			`autoSetupMerge = true`

Add pushoption example 2022-05-10 23:19:42 -05:00			`# [push]`
			`# pushOption = merge_request.create`
			`# pushOption = merge_request.remove_source_branch`
			`# pushOption = merge_request.assign="daniel.flanagan"`
Updates 2022-06-19 10:28:33 -05:00
Various improvements 2023-04-13 14:04:29 -05:00			`[url "git@git.hq.bill.com:"]`
Sway stuff, new primary desktop monitor, etc. 2023-04-21 23:50:06 -05:00			`insteadOf = https://git.hq.bill.com/`