Commit graph

18 commits

Author SHA1 Message Date
Eryn Wells
39294aa58e [git] Add rbm alias -> rebase origin/master master 2019-11-08 16:30:28 -08:00
270acfd504 [git] stash by default on rebase 2018-03-22 09:21:53 -07:00
Eryn Wells
f2d42050c9 [git] Add mine alias to dump my commits 2016-09-23 16:57:59 -07:00
b4a82263b6 [git] Add some aliases for rebase and merge process; clean up tabs in the config 2016-09-16 14:07:49 -07:00
94e024c9f8 [git] sup = submodule update --recursive 2015-05-07 08:37:43 -07:00
73a201ed50 [git] Add global git ignore 2014-10-17 23:15:35 -07:00
1a1de09fd7 Set git push.default = simple 2013-08-30 09:02:55 -07:00
27789e5f3d Remove duplicate difftool entry for Kaleidoscope 2013-03-12 11:00:44 -07:00
2e04bc2433 Unstash work-local changes and merge
- Fix gitconfig to use Kaleidoscope
- Toggle solarized background with <F10>
2013-01-24 16:30:53 -08:00
9df36b0a3f Make Kaleidoscope git's diff and merge tool 2013-01-05 10:28:25 -08:00
02d169878d Merge aliases and settings; use Kaleidoscope for diffing 2012-11-27 16:24:10 -08:00
406026f038 Updated git aliases for MOAR consistency! 2012-08-27 10:30:22 -07:00
bf3c192bbd Aliases from Howard Yeh 2012-08-27 10:27:09 -07:00
7b2074e292 Add push alias to git config 2012-08-07 11:18:50 -07:00
e2234bd4a0 Fix some formatting in .gitconfig 2012-07-20 09:36:57 -07:00
e4774cbd3d Add quotepath to gitconfig
I think this gets added automatically. I certainly didn't add it...
2012-01-09 16:30:01 -08:00
b2275e7705 Change email address 2011-07-29 07:48:17 -07:00
Eryn Wells
662fe0334c Initial commit 2011-05-03 21:53:50 -07:00