9 commits

Author	SHA1	Message	Date
Jeremy Kaplan	16cc033c26	git conflict style	2018-01-16 21:08:54 -08:00
Jeremy Kaplan	0febd5ce84	git aliases	2017-11-18 16:11:39 -08:00
Jeremy Kaplan	40750abe85	More git aliases	2017-11-17 09:22:04 -08:00
Jeremy Kaplan	4af8673564	Add git aliases	2017-11-14 09:54:29 -08:00
Jeremy Kaplan	c94b978f3d	Update VCS configs	2017-09-24 22:04:29 -04:00
Jeremy Kaplan	059176fb04	Add new configs based on type of install	2016-06-11 21:14:51 -04:00
Jeremy Kaplan	25ea85f5a1	Fix incorrectly global git merge config	2015-11-20 23:03:15 -05:00
Jeremy Kaplan	dc5043e4d7	Update git config	2015-10-12 02:10:53 -04:00
Jeremy Kaplan	9f3dbabda9	Add git and hg configs	2015-09-05 00:05:43 -04:00