| 
							
						 | 
						
							
							
							
							
								
							
							
								e9c5bcb0d9
								
							
						 | 
						
							
							
								
								Fix mktemp call in import_cacert
							
							
							
							
							
						 | 
						
							2013-04-02 09:43:42 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								7461ce7c8f
								
							
						 | 
						
							
							
								
								Fix zsh completion colors
							
							
							
							
							
						 | 
						
							2013-04-02 09:37:49 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b49586946e
								
							
						 | 
						
							
							
								
								Add import_cacert zsh function
							
							
							
							
							
						 | 
						
							2013-04-02 09:35:35 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eryn Wells
								
							 
						 | 
						
							
							
							
							
								
							
							
								ae2a58d744
								
							
						 | 
						
							
							
								
								Clear out accidentally added local settings in env.local
							
							
							
							
							
							
							
							Conflicts:
	env.local 
							
						 | 
						
							2013-03-25 13:21:13 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1174874930
								
							
						 | 
						
							
							
								
								Disable p4 for vcs_info -- it takes for friggin ever
							
							
							
							
							
						 | 
						
							2013-03-25 13:15:58 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								fc777ac549
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-03-24 19:02:41 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								8db3071715
								
							
						 | 
						
							
							
								
								Comment out C comments -- the setting interferes with my comments plugin
							
							
							
							
							
						 | 
						
							2013-03-24 19:02:23 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5f384eda0d
								
							
						 | 
						
							
							
								
								Fix snippets file macro
							
							
							
							
							
						 | 
						
							2013-03-24 19:02:05 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								fd5ced8e5a
								
							
						 | 
						
							
							
								
								Fix ls setup in rc
							
							
							
							
							
						 | 
						
							2013-03-24 19:01:48 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								c4216c9332
								
							
						 | 
						
							
							
								
								Add local python to PATH
							
							
							
							
							
						 | 
						
							2013-03-24 19:01:35 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f63a42f19f
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-03-24 18:52:55 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								a591e33760
								
							
						 | 
						
							
							
								
								Add back status-bg setting in tmux.conf
							
							
							
							
							
						 | 
						
							2013-03-12 16:01:51 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f04ecc43ac
								
							
						 | 
						
							
							
								
								Remove git from omz configuration
							
							
							
							
							
						 | 
						
							2013-03-12 15:48:56 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								9375e417d5
								
							
						 | 
						
							
							
								
								Move vcs_info message to configure_vcs_info()
							
							
							
							
							
						 | 
						
							2013-03-12 15:39:56 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								53f368a306
								
							
						 | 
						
							
							
								
								Set g() instead of alias g=git
							
							
							
							
							
						 | 
						
							2013-03-12 15:39:46 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f2aaab9491
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-03-12 15:35:28 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								4ca4e39e03
								
							
						 | 
						
							
							
								
								Remove explicit setting of comments in c.vim
							
							
							
							
							
						 | 
						
							2013-03-12 15:34:47 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1f8f5e3a9f
								
							
						 | 
						
							
							
								
								Check $TMUX variable to see if we're in a tmux session before printing list
							
							
							
							
							
						 | 
						
							2013-03-12 14:01:55 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f90198bf2b
								
							
						 | 
						
							
							
								
								Add configure_vcs_info function to zshrc
							
							
							
							
							
						 | 
						
							2013-03-12 13:58:13 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5ba6c60a91
								
							
						 | 
						
							
							
								
								Set PS1_JOBS
							
							
							
							
							
						 | 
						
							2013-03-12 13:57:58 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5b3bc2653b
								
							
						 | 
						
							
							
								
								Extra linebreaks in vimrc
							
							
							
							
							
						 | 
						
							2013-03-12 11:03:11 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								4129bc6022
								
							
						 | 
						
							
							
								
								Tmux theme tweaks
							
							
							
							
							
							
							
							Looks more like @vilhalmer's config:
https://twitter.com/vilhalmer/status/311529816304267264 
							
						 | 
						
							2013-03-12 11:01:09 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								402d298f52
								
							
						 | 
						
							
							
								
								Irssi theme tweaks
							
							
							
							
							
						 | 
						
							2013-03-12 11:00:55 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								27789e5f3d
								
							
						 | 
						
							
							
								
								Remove duplicate difftool entry for Kaleidoscope
							
							
							
							
							
						 | 
						
							2013-03-12 11:00:44 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Eryn Wells
								
							 
						 | 
						
							
							
							
							
								
							
							
								8426c840ba
								
							
						 | 
						
							
							
								
								Ignore irssi's away.log
							
							
							
							
							
							
							
							Conflicts:
	.gitignore 
							
						 | 
						
							2013-03-12 11:00:27 -07:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f07bb147c1
								
							
						 | 
						
							
							
								
								Use the Light varient of Source Code Pro for the Vim GUI
							
							
							
							
							
						 | 
						
							2013-03-08 09:20:25 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								102567a830
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-03-06 09:16:51 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								470b583f28
								
							
						 | 
						
							
							
								
								Show history count in RPS1
							
							
							
							
							
						 | 
						
							2013-03-06 09:16:25 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								b4bdc559bc
								
							
						 | 
						
							
							
								
								Ignore vim spelling files
							
							
							
							
							
						 | 
						
							2013-03-06 09:16:07 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2e32f224c6
								
							
						 | 
						
							
							
								
								Add git_gutter toggles
							
							
							
							
							
						 | 
						
							2013-03-06 09:15:40 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								43eb3c064d
								
							
						 | 
						
							
							
								
								Ignore .DS_Store files
							
							
							
							
							
						 | 
						
							2013-02-15 21:27:46 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								635baf6799
								
							
						 | 
						
							
							
								
								Add history and job count to RPS1 in loquacious
							
							
							
							
							
						 | 
						
							2013-02-15 21:27:21 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2483f6ef8a
								
							
						 | 
						
							
							
								
								Remove ledgerrc options that don't work with Ledger 3.0
							
							
							
							
							
						 | 
						
							2013-02-01 15:47:15 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								70a40e8453
								
							
						 | 
						
							
							
								
								Remove syntax file header -- was causing crazy recursive calls
							
							
							
							
							
						 | 
						
							2013-02-01 10:49:05 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								c582a2f1f3
								
							
						 | 
						
							
							
								
								Vim syntax and highlighting extensions for ObjC 2.0
							
							
							
							
							
						 | 
						
							2013-01-31 14:10:22 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f9f9587015
								
							
						 | 
						
							
							
								
								Fix weird logging bug -- zsh expands fpath in this message even when I don't want it to
							
							
							
							
							
						 | 
						
							2013-01-31 14:10:22 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								786774499e
								
							
						 | 
						
							
							
								
								Clone OMZ to ~/.oh-my-zsh
							
							
							
							
							
						 | 
						
							2013-01-31 14:10:22 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								d94219d521
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-01-31 13:46:49 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								35a2e35d6e
								
							
						 | 
						
							
							
								
								Accidentally committed NOISY=20; fix it
							
							
							
							
							
						 | 
						
							2013-01-31 13:42:26 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								51eaa2f3f7
								
							
						 | 
						
							
							
								
								Move markdown file detection (*.md) to ftdetect script
							
							
							
							
							
						 | 
						
							2013-01-31 13:42:26 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								84b19f4ae0
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-01-31 10:52:59 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								031f715659
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-01-25 17:41:18 -08: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 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								059a9fa8cf
								
							
						 | 
						
							
							
								
								Autoload refresh_system_tags function
							
							
							
							
							
						 | 
						
							2013-01-23 13:25:03 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								09c5de132f
								
							
						 | 
						
							
							
								
								Set tags files for Vim
							
							
							
							
							
						 | 
						
							2013-01-23 13:24:37 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								167cd9c78c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/master'
							
							
							
							
							
						 | 
						
							2013-01-23 11:14:33 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								71c3c06be4
								
							
						 | 
						
							
							
								
								Add Tomorrow{,Night} Vim colorschemes
							
							
							
							
							
						 | 
						
							2013-01-23 11:12:19 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f40332b379
								
							
						 | 
						
							
							
								
								Add Oh My ZSH! dependency and make a few adjustments to accomodate
							
							
							
							
							
						 | 
						
							2013-01-23 11:11:52 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								52396e8b55
								
							
						 | 
						
							
							
								
								Use add-zsh-hook for prompt hooks; fix colors of prompt components
							
							
							
							
							
						 | 
						
							2013-01-23 10:55:15 -08:00 | 
						
						
							
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								6413841d0f
								
							
						 | 
						
							
							
								
								Redo some dircolors for OS X to handle new color settings in iTerm
							
							
							
							
							
						 | 
						
							2013-01-23 10:54:47 -08:00 | 
						
						
							
							
							
							
								
							
							
						 |