Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge upstream

  • Loading branch information...
commit 8a8a7bafa037ef253ce582a182c77a74b76ac309 2 parents 71b1c60 + ff545e6
James Cox imajes authored
2  .gitignore
View
@@ -1,3 +1,5 @@
locals.zsh
log/.zsh_history
projects.zsh
+custom/*.zsh
+!custom/example.zsh
5 README.textile
View
@@ -43,8 +43,13 @@ TODO: Update this..
* much much more..
h2. Useful
+
the "refcard":http://www.bash2zsh.com/zsh_refcard/refcard.pdf is pretty tasty for tips.
+h3. Customization
+
+If you want to override any of the default behavior, just add a new file (ending in @.zsh@) into the @custom/@ directory.
+
h3. Uninstalling
If you want to uninstall it, just run @uninstall_oh_my_zsh@ from the command line and it'll remove itself and revert you to bash (or your previous zsh config).
0  projects.zsh-example → custom/example.zsh
View
File renamed without changes
0  aliases.zsh → lib/aliases.zsh
View
File renamed without changes
0  colors.zsh → lib/colors.zsh
View
File renamed without changes
0  completion.zsh → lib/completion.zsh
View
File renamed without changes
0  functions.zsh → lib/functions.zsh
View
File renamed without changes
0  git.zsh → lib/git.zsh
View
File renamed without changes
0  grep.zsh → lib/grep.zsh
View
File renamed without changes
6 history.zsh → lib/history.zsh
View
@@ -1,8 +1,8 @@
## Command history configuration
-#
HISTFILE=$HOME/.zsh_history
-HISTSIZE=5000
-SAVEHIST=5000
+HISTSIZE=10000
+SAVEHIST=10000
+
setopt hist_ignore_dups # ignore duplication command history list
setopt share_history # share command history data
0  key-bindings.zsh → lib/key-bindings.zsh
View
File renamed without changes
0  prompt.zsh → lib/prompt.zsh
View
File renamed without changes
4 rake_completion.zsh → lib/rake_completion.zsh
View
@@ -17,7 +17,7 @@ _rake () {
fi
}
-compdef _rake rake
+compctl -K _rake rake
function _cap_does_task_list_need_generating () {
if [ ! -f .cap_tasks~ ]; then return 0;
@@ -39,4 +39,4 @@ function _cap () {
fi
}
-compdef _cap cap
+compctl -K _cap cap
5 oh-my-zsh.sh
View
@@ -2,4 +2,7 @@
# Load all of the config files in ~/oh-my-zsh that end in .zsh
# TIP: Add files you don't want in git to .gitignore
-for config_file ($ZSH/*.zsh) source $config_file
+for config_file ($ZSH/lib/*.zsh) source $config_file
+
+# Load all of your custom configurations from custom/
+for config_file ($ZSH/custom/*.zsh) source $config_file
Please sign in to comment.
Something went wrong with that request. Please try again.