23c7003fc9 
					 
					
						
						
							
							Add a bunch of git aliases including untracked, root and ignore.  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3a3e826f7d 
					 
					
						
						
							
							Add git dtbmb.  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						04a5c9767e 
					 
					
						
						
							
							add sbt dependency.  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0f28996576 
					 
					
						
						
							
							Remove unused stuff from osx.sh  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						0ee8ce71af 
					 
					
						
						
							
							Refactor some stuff.  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						94c3a79793 
					 
					
						
						
							
							cleanup bootstrap.sh. reorganize gitconfig.  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						bfed868acd 
					 
					
						
						
							
							monkai in emacs.d  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						544b3c5542 
					 
					
						
						
							
							ignore dirlocals in .emacs.d  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						39f9febbe9 
					 
					
						
						
							
							added scala support to emacs.d  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9e0c90ba25 
					 
					
						
						
							
							Get rid of some submodules in .emacs.d  
						
						
						
						
					 
					
						2014-12-20 03:21:22 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						62349e337d 
					 
					
						
						
							
							Move non-shell related things to resources.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e9574821db 
					 
					
						
						
							
							fix smex for old versions of emacs.d, bump pointer.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e4683e46b5 
					 
					
						
						
							
							Remove all elpa tracking for .emacs.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9721ac4d67 
					 
					
						
						
							
							os-copy for emacs.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						5be58e2f34 
					 
					
						
						
							
							fix git reset-branch  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3f1ab9a530 
					 
					
						
						
							
							os-copy for emacs.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						85e4a839ff 
					 
					
						
						
							
							add daemonize to brew.sh  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						01ecc3f597 
					 
					
						
						
							
							update clipboard to reattach to user so that pbcopy works inside of tmux.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						11dc5a04e3 
					 
					
						
						
							
							got rid of last reference to parse_git_branch  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						3d022a9fbc 
					 
					
						
						
							
							change git which-branch definition to be compatible with old git.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						dcd1cc3b23 
					 
					
						
						
							
							added git ffr expressed ffo in terms of ffr  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						e84668c75a 
					 
					
						
						
							
							add smart_copy, refactor remote clipboard names.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c42793b3c5 
					 
					
						
						
							
							ffs -> ffo. ffo fast-fowards to origin with a fetch.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						745a83ce41 
					 
					
						
						
							
							add git cam and git ff  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						322f862e76 
					 
					
						
						
							
							add sha, which-branch to gitconfig. add is_ssh.  
						
						
						
						
					 
					
						2014-12-20 03:21:21 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						56342141da 
					 
					
						
						
							
							add git reset-origin and go2dotfiles.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						444f12c844 
					 
					
						
						
							
							Git diff add bump .emacs.d remove useless aliases.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6c1663505d 
					 
					
						
						
							
							emacs.d pointer bump, small tmux.conf changes.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						aaf5b21f29 
					 
					
						
						
							
							Add melpa and thems to emacs.d  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						769ab7ed7c 
					 
					
						
						
							
							Add terminal info that allows emacs to use full color spectrum.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						66db631cb8 
					 
					
						
						
							
							Fix bootstrop symlinking  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						03eb46689d 
					 
					
						
						
							
							Fix .tmux.conf  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						64ead55fe5 
					 
					
						
						
							
							tweaks to make no sandbox show at the appropriate time only.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						35bf7f00c0 
					 
					
						
						
							
							tweaks to bootstrap for debian compatibility.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						73d8b3e8d5 
					 
					
						
						
							
							use readlink_command in bootstrap.sh.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						312e8266c9 
					 
					
						
						
							
							Small fixes for bash prompt.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						ea3962b380 
					 
					
						
						
							
							Fix git_is_dirty  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						d8d47433d0 
					 
					
						
						
							
							Prompt fixes in zsh.  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						cfc5cdbb6f 
					 
					
						
						
							
							Create README.md  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						c37165ae69 
					 
					
						
						
							
							Added RPROMPT and PS2  
						
						
						
						
					 
					
						2014-12-20 03:21:20 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						30b45038eb 
					 
					
						
						
							
							Add ls colors.  
						
						
						
						
					 
					
						2014-12-20 03:21:19 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						1afd13b94f 
					 
					
						
						
							
							stuff that needed to be deleted?  
						
						
						
						
					 
					
						2014-12-20 02:53:49 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						9cb3ecfdb8 
					 
					
						
						
							
							Initial commit.  
						
						... 
						
						
						
						Conflicts:
	.gitmodules
	dotfiles/lib/shellrc/aliases.sh 
						
						
					 
					
						2014-12-20 02:48:07 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						51d110b07d 
					 
					
						
						
							
							add git poh  
						
						
						
						
					 
					
						2014-12-20 02:42:25 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						37dcb294bc 
					 
					
						
						
							
							Move zsh prompt to zsh/prompt.sh  
						
						
						
						
					 
					
						2014-12-20 02:42:25 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						2e8a7c572c 
					 
					
						
						
							
							Fix zsh prompt to exapand every time.  
						
						
						
						
					 
					
						2014-12-20 02:42:25 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						7385ca2085 
					 
					
						
						
							
							Fix zshrc and prompt.  
						
						
						
						
					 
					
						2014-12-20 02:42:24 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						b912a0879d 
					 
					
						
						
							
							remove tmux-powerline.  
						
						
						
						
					 
					
						2014-12-20 02:42:24 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						6174990049 
					 
					
						
						
							
							Add iterm settings, tweak bootstrap, bump eamcs pointer.  
						
						... 
						
						
						
						Fix web_start.
Add remote_clipboard server stuff.
Bump .emacs.d pointer and add remote_os_copy alias.
Way better get_cols
Made git sui git suir
move to same sha as yelp branch for .emacs.d
Bump emacs pointer.
simplified default code for remote_clipboard.
Remove unused functions from .functions.
Added things from yelp branch.
yelpify
Added field separator to get_cols.
Lots of refactoring. Added .lib directory. Moved dotfiles that get symlinked to ~ into their own directory. Remove some vim configuration.
Remove oh-my-zsh. 
						
						
					 
					
						2014-12-20 02:42:24 -08:00 
						 
				 
			
				
					
						
					 
					
						
						
							
						
						448eebed44 
					 
					
						
						
							
							Added greadlink stuff.  
						
						
						
						
					 
					
						2014-12-20 02:42:24 -08:00