4 commits

Author	SHA1	Message	Date
William Carroll	27faf0c14d	Adds git aliases for viewing conflicts	2017-08-01 17:51:06 -04:00
William Carroll	4eb9908e2f	Sets autosquash as default for rebasing	2017-08-01 09:44:15 -04:00
William Carroll	4c5ea5a5b3	Sets git default push branch	2017-07-29 21:33:03 -04:00
William Carroll	35594873ed	Adds gitconfig	2017-06-23 13:01:44 -04:00