Merge branch 'normalize-repository'

This commit is contained in:
Marc Cornellà 2016-05-12 16:48:13 +02:00
commit 4d9ae02d74
8 changed files with 15 additions and 19 deletions

11
.gitignore vendored
View file

@ -1,9 +1,8 @@
locals.zsh # custom files
log/.zsh_history custom/
projects.zsh
custom
!custom/plugins/example !custom/plugins/example
!custom/example.zsh !custom/example.zsh
*.swp
!custom/example.zshcache # temp files directories
cache/ cache/
log/

View file

@ -210,4 +210,4 @@ We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-
## License ## License
Oh My Zsh is released under the [MIT license](MIT-LICENSE.txt). Oh My Zsh is released under the [MIT license](LICENSE.txt).

4
cache/.easter-egg vendored
View file

@ -1,4 +0,0 @@
This file is only here so that Git will keep a cache directory as .gitignore is ignoring all the files within it.
Feel free to add love notes for people here.

0
cache/.gitkeep vendored Normal file
View file

View file

@ -1,5 +1,10 @@
# Add yourself some shortcuts to projects you often work on # You can put files here to add functionality separated per file, which
# Example: # 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=/Users/robbyrussell/Projects/development/planetargon/brainstormr # brainstormr=~/Projects/development/planetargon/brainstormr
# cd $brainstormr
# #

View file

@ -1,4 +0,0 @@
This file is only here so that Git will keep a log directory as .gitignore is ignoring all the log files within it.
feel free to add love notes for people here.

0
log/.gitkeep Normal file
View file