Merge branch 'normalize-repository'

ohmyzsh · May 12, 2016 · 4d9ae02 · 4d9ae02
2 parents 25dddd2 + 7a0d299
commit 4d9ae02
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,8 @@
-locals.zsh
-log/.zsh_history
-projects.zsh
-custom
+# custom files
+custom/
 !custom/plugins/example
 !custom/example.zsh
-*.swp
-!custom/example.zshcache
+
+# temp files directories
 cache/
+log/
diff --git a/MIT-LICENSE.txt → LICENSE.txt b/MIT-LICENSE.txt → LICENSE.txt
diff --git a/README.markdown → README.md b/README.markdown → README.md
@@ -210,4 +210,4 @@ We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-
 
 ## License
 
-Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt).
+Oh My Zsh is released under the [MIT license](LICENSE.txt).
diff --git a/cache/.easter-egg b/cache/.easter-egg
diff --git a/cache/.gitkeep b/cache/.gitkeep
diff --git a/custom/example.zsh b/custom/example.zsh
@@ -1,5 +1,10 @@
-# Add yourself some shortcuts to projects you often work on
-# Example:
+# You can put files here to add functionality separated per file, which
+# will be ignored by git.
+# Files on the custom/ directory will be automatically loaded by the init
+# script, in alphabetical order.
+
+# For example: add yourself some shortcuts to projects you often work on.
+#
+# brainstormr=~/Projects/development/planetargon/brainstormr
+# cd $brainstormr
 #
-# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
-#
diff --git a/log/.easter-egg b/log/.easter-egg
diff --git a/log/.gitkeep b/log/.gitkeep