From 26a07b0ad87162805e69ce18c56627772a663aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Sun, 12 Apr 2015 00:37:35 +0200 Subject: [PATCH 1/5] Rename README.markdown to README.md for consistency --- README.markdown => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename README.markdown => README.md (100%) diff --git a/README.markdown b/README.md similarity index 100% rename from README.markdown rename to README.md From 2198ff05e3b26532865f91a9ac1bac5fc673c05b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 12 May 2016 13:52:13 +0200 Subject: [PATCH 2/5] Rename license to LICENSE.txt for consistency --- MIT-LICENSE.txt => LICENSE.txt | 0 README.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename MIT-LICENSE.txt => LICENSE.txt (100%) diff --git a/MIT-LICENSE.txt b/LICENSE.txt similarity index 100% rename from MIT-LICENSE.txt rename to LICENSE.txt diff --git a/README.md b/README.md index 0cbea72c9..5f152e4df 100644 --- a/README.md +++ b/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). From 66e7e7d9ca78a5e62664abbb3c5c72e163119afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Tue, 15 Dec 2015 11:16:02 +0100 Subject: [PATCH 3/5] Use .gitkeep files to keep cache/ and log/ directories Instead of .easter-egg files we now have empty .gitkeep files, like is done as an informal standard. --- .gitignore | 3 +++ cache/.easter-egg | 4 ---- cache/.gitkeep | 0 log/.easter-egg | 4 ---- log/.gitkeep | 0 5 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 cache/.easter-egg create mode 100644 cache/.gitkeep delete mode 100644 log/.easter-egg create mode 100644 log/.gitkeep diff --git a/.gitignore b/.gitignore index 8fa66f02f..567cd4e4d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,6 @@ custom *.swp !custom/example.zshcache cache/ +!cache/.gitkeep +log/ +!log/.gitkeep diff --git a/cache/.easter-egg b/cache/.easter-egg deleted file mode 100644 index 4b6164edb..000000000 --- a/cache/.easter-egg +++ /dev/null @@ -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. - diff --git a/cache/.gitkeep b/cache/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/log/.easter-egg b/log/.easter-egg deleted file mode 100644 index 2533149e2..000000000 --- a/log/.easter-egg +++ /dev/null @@ -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. - diff --git a/log/.gitkeep b/log/.gitkeep new file mode 100644 index 000000000..e69de29bb From 54ace41f3ce890f76cc455aac3aea0b10a467411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Sat, 1 Aug 2015 14:47:36 +0200 Subject: [PATCH 4/5] Tidy up gitignore file - `custom/example.zshcache` doesn't exist anymore: it's safe to ignore. - `*.swp` files are ignored for no apparent reason. There's nothing in the codebase that generates them. This was introduced by @lepht in commit f78218f6 on 24 May 2011. - Files `locals.zsh` and `projects.zsh` are no longer supported for putting custom configuration there. This is since commit 8debd09 where files were put in a lib/ folder, but failed to modify the .gitignore file as well. The init script was modified as well, so those files aren't even being sourced: they are safe to be deleted or ported into a custom script. --- .gitignore | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 567cd4e4d..b2022081a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +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/ -!cache/.gitkeep log/ -!log/.gitkeep From 7a0d299e96a8a1707630d59859f048e9ebde9456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Cornell=C3=A0?= Date: Thu, 12 May 2016 13:59:10 +0200 Subject: [PATCH 5/5] Reword and clarify example.zsh custom file --- custom/example.zsh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/custom/example.zsh b/custom/example.zsh index 28ffcae25..c505a9673 100644 --- 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 -# \ No newline at end of file