summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobby Russell <robby@planetargon.com>2013-10-24 20:26:20 -0700
committerRobby Russell <robby@planetargon.com>2013-10-24 20:26:20 -0700
commit9f88fb522901579242e1aaf99e420efd90fd0205 (patch)
treeb992cc8c8209a0da52eac054493201fd39b4c52f
parente44c147e25ec5dfbf20d5b98544c8b8484abd856 (diff)
parentc5902d3f3498f9cd7553f358f2bf741b0784dbd0 (diff)
downloadzsh-9f88fb522901579242e1aaf99e420efd90fd0205.tar.gz
zsh-9f88fb522901579242e1aaf99e420efd90fd0205.tar.bz2
zsh-9f88fb522901579242e1aaf99e420efd90fd0205.zip
Merge pull request #2165 from kevinxucs/custom-gitignore-fix
gitignore fix for custom folder.
-rw-r--r--.gitignore5
-rw-r--r--plugins/gitignore/gitignore.plugin.zsh (renamed from custom/plugins/gitignore/gitignore.plugin.zsh)0
-rw-r--r--plugins/sfffe/sfffe.plugin.zsh (renamed from custom/plugins/sfffe/sfffe.plugin.zsh)0
3 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5db11ce5c..c2b47bba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
locals.zsh
log/.zsh_history
projects.zsh
-custom/example
-custom/example.zsh
+-custom/*
+-!custom/example
+-!custom/example.zsh
*.swp
!custom/example.zshcache
cache/
diff --git a/custom/plugins/gitignore/gitignore.plugin.zsh b/plugins/gitignore/gitignore.plugin.zsh
index 332497cec..332497cec 100644
--- a/custom/plugins/gitignore/gitignore.plugin.zsh
+++ b/plugins/gitignore/gitignore.plugin.zsh
diff --git a/custom/plugins/sfffe/sfffe.plugin.zsh b/plugins/sfffe/sfffe.plugin.zsh
index a0f034908..a0f034908 100644
--- a/custom/plugins/sfffe/sfffe.plugin.zsh
+++ b/plugins/sfffe/sfffe.plugin.zsh