Fredrik Appelberg
							
						 
					 | 
					
						
						
						
						
							
						
						
							e24230cbfb
							
						
					 | 
					
						
						
							
							Merge branch 'master' of git@github.com:fred-o/oh-my-zsh
						
						
						
						
						
						
						
						Conflicts:
	.gitignore 
						
						
					 | 
					
						2011-12-08 10:02:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pete Clark
							
						 
					 | 
					
						
						
						
						
							
						
						
							8411a39a86
							
						
					 | 
					
						
						
							
							Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into taskwarrior-plugin
						
						
						
						
						
						
					 | 
					
						2011-05-29 18:51:32 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Jake Bell
							
						 
					 | 
					
						
						
						
						
							
						
						
							f8aae64e47
							
						
					 | 
					
						
						
							
							Adding ability to override plugins from the custom directory.
						
						
						
						
						
						
					 | 
					
						2011-05-26 12:34:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Pete Clark
							
						 
					 | 
					
						
						
						
						
							
						
						
							f78218f625
							
						
					 | 
					
						
						
							
							Adds compl .swp caches to gitignore
						
						
						
						
						
						
					 | 
					
						2011-05-24 15:25:18 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Daudt
							
						 
					 | 
					
						
						
						
						
							
						
						
							7377ba3f7a
							
						
					 | 
					
						
						
							
							Added git-flow plugin
						
						
						
						
						
						
					 | 
					
						2011-04-29 11:54:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Fredrik Appelberg
							
						 
					 | 
					
						
						
						
						
							
						
						
							0504a01012
							
						
					 | 
					
						
						
							
							.gitignore
						
						
						
						
						
						
					 | 
					
						2011-03-07 13:49:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robin Ramael
							
						 
					 | 
					
						
						
						
						
							
						
						
							77d05fe8ab
							
						
					 | 
					
						
						
							
							Made git ignore everything  in custom, not only the .zsh files.
						
						
						
						
						
						
					 | 
					
						2011-01-10 17:01:11 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cox
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a8a7bafa0
							
						
					 | 
					
						
						
							
							merge upstream
						
						
						
						
						
						
					 | 
					
						2009-09-23 16:14:04 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robby Russell
							
						 
					 | 
					
						
						
						
						
							
						
						
							19a08f15d6
							
						
					 | 
					
						
						
							
							not ignoring example.zsh
						
						
						
						
						
						
					 | 
					
						2009-09-23 08:05:05 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robby Russell
							
						 
					 | 
					
						
						
						
						
							
						
						
							ef9ce1e221
							
						
					 | 
					
						
						
							
							Updating .gitignore to ignore everything but the example.zsh file in custom/
						
						
						
						
						
						
					 | 
					
						2009-09-23 08:03:38 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								James Cox
							
						 
					 | 
					
						
						
						
						
							
						
						
							93af38f154
							
						
					 | 
					
						
						
							
							further refactorings
						
						
						
						
						
						
					 | 
					
						2009-09-23 00:49:00 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Robby Russell
							
						 
					 | 
					
						
						
						
						
							
						
						
							e20401e04e
							
						
					 | 
					
						
						
							
							Adding initial gitignore file
						
						
						
						
						
						
					 | 
					
						2009-08-28 11:14:03 -07:00 | 
					
					
						
						
							
							
							
						
					 |