Commit graph

25 commits

Author SHA1 Message Date
958c97f582 initial merge 2020-03-03 13:05:08 -08:00
25e11721fb updated configs 2020-03-03 12:39:36 -08:00
6e4516de0e update portia settings 2020-03-03 12:38:08 -08:00
1225e52427 update, use zeal 2019-11-18 14:48:36 -08:00
b361bf52e1 various shell improvements 2019-10-09 18:45:55 -07:00
415cc078f7 Add git.barakmich.com to gitconfig 2019-05-21 14:50:07 -07:00
fa71de6291 Institude Filepath, veonim, and git-diff3-style 2019-04-01 11:05:56 -07:00
0b64b1cbe2 Institude Filepath, veonim, and git-diff3-style 2019-04-01 11:05:32 -07:00
9a13fa283d misc work fixes 2019-01-29 16:02:37 -08:00
94d4387df6 add gitconfig for ssh upstream of github 2018-07-29 11:31:44 -07:00
f49657495b Adds ALE, LanguageClient, and clang 2018-06-25 13:21:31 -07:00
924ec15b2a update 2016-05-13 17:05:59 -07:00
b07b652553 rerere is supposedly awesome 2014-05-15 13:32:02 -04:00
0281f26c15 update push semantics 2013-05-03 14:26:24 -04:00
c17e59bf17 Add ours/theirs 2013-04-08 11:12:52 -04:00
078c8c17b1 revert and update things 2013-03-25 14:32:47 -07:00
af9af00202 take new default push 2013-03-21 10:47:17 -07:00
090f218b74 new gitconfig 2013-02-03 20:47:54 -08:00
96afa20a95 Add -uno to gitconfig 2012-09-11 17:32:21 -07:00
db1a5a341b Fix up gitconfig, add alias for revert 2012-02-23 14:19:05 -08:00
7d8d6789ce Fix up gitconfig so graph works 2012-02-21 15:15:45 -08:00
michener
a166da6f0e Mild changes
git-svn-id: http://photonzero.com/dotfiles/trunk@117 23f722f6-122a-0410-8cef-c75bd312dd78
2012-01-29 03:35:01 +00:00
michener
80ae6adf84 Better diff commands
git-svn-id: http://photonzero.com/dotfiles/trunk@99 23f722f6-122a-0410-8cef-c75bd312dd78
2011-05-14 00:38:25 +00:00
michener
5e126c3ae4 Minor fixes
git-svn-id: http://photonzero.com/dotfiles/trunk@68 23f722f6-122a-0410-8cef-c75bd312dd78
2010-10-02 07:42:59 +00:00
michener
b789a98c1b Add a gitconfig
git-svn-id: http://photonzero.com/dotfiles/trunk@39 23f722f6-122a-0410-8cef-c75bd312dd78
2010-03-10 05:13:12 +00:00