Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

erge

  • Loading branch information...
commit 4bd70adc81e9e2d0481c685b9cc969145db8f602 2 parents 93c2e71 + 7f17149
Rick DeNatale authored
4 bash/aliases
@@ -104,7 +104,6 @@ alias cg='cd `gem environment gemdir`'
104 104 # database migrate
105 105 alias dbm='rake db:migrate'
106 106
107   -
108 107 # rails logs, tailing and cleaning
109 108 alias tdl='tail -f ./log/development.log'
110 109 alias ttl='tail -f ./log/test.log'
@@ -118,9 +117,6 @@ alias cg='cd `gem environment gemdir`'
118 117 alias mlmig='mateLastMigration'
119 118 alias dlmig="downLastMigration"
120 119
121   -# Ruby
122   - alias r='rake'
123   -
124 120 # gem
125 121 alias sgi='sudo gem install'
126 122
8 bash/env
@@ -32,13 +32,15 @@ fi
32 32
33 33
34 34
35   -export PATH="/usr/local/bin;/usr/local/sbin:"$PATH
  35 +export PATH="/usr/local/bin:/usr/local/sbin:"$PATH
36 36
37 37 # export MANPATH="${MANPATH}:/opt/local/share/man"
38   -# export VISUALWORKS="/Users/rick/vw7.6nc"
39   -# export MAGLEV_HOME=/Users/rick/maglev
  38 +# export VISUALWORKS="/Users/rickd/vw7.6nc"
  39 +# export MAGLEV_HOME=/Users/rickd/maglev
40 40 # export PATH=$MAGLEV_HOME/bin:$PATH
41 41 # export PATH="/usr/local/mysql/bin:$PATH"
42 42 # export PATH="/usr/local/mongodb/bin:$PATH"
  43 +export PATH="$PATH:/usr/local/msp430-toolchain/bin"
43 44 export EDITOR='mate -w'
44 45 export GIT_EDITOR='mate -w'
  46 +export NODE_PATH='/usr/local/lib/node'
4 bash_profile
@@ -7,9 +7,9 @@
7 7 . ~/bin/dotfiles/bash/completions
8 8
9 9 ##
10   -# Your previous /Users/rick/.bash_profile file was backed up as /Users/rick/.bash_profile.macports-saved_2009-12-06_at_11:56:31
  10 +# Your previous /Users/rickd/.bash_profile file was backed up as /Users/rickd/.bash_profile.macports-saved_2009-12-06_at_11:56:31
11 11 ##
12 12
13 13 # rvm-install added line:
14   -if [[ -s /Users/rick/.rvm/scripts/rvm ]] ; then source /Users/rick/.rvm/scripts/rvm ; fi
  14 +if [[ -s /Users/rickd/.rvm/scripts/rvm ]] ; then source /Users/rickd/.rvm/scripts/rvm ; fi
15 15
3  bashrc
@@ -8,7 +8,8 @@ fi
8 8 . ~/bin/dotfiles/bash/env
9 9 . ~/bin/dotfiles/bash/aliases
10 10
  11 +source ~/bin/dotfiles/git-flow-completion/git-flow-completion.bash
11 12
12 13 # rvm-install added line:
13   -if [[ -s /Users/rick/.rvm/scripts/rvm ]] ; then source /Users/rick/.rvm/scripts/rvm ; fi
  14 +if [[ -s /Users/rickd/.rvm/scripts/rvm ]] ; then source /Users/rickd/.rvm/scripts/rvm ; fi
14 15
22 git-flow-completion/LICENSE
... ... @@ -0,0 +1,22 @@
  1 +Copyright (c) 2010 Justin Hileman
  2 +
  3 +Permission is hereby granted, free of charge, to any person
  4 +obtaining a copy of this software and associated documentation
  5 +files (the "Software"), to deal in the Software without
  6 +restriction, including without limitation the rights to use,
  7 +copy, modify, merge, publish, distribute, sublicense, and/or sell
  8 +copies of the Software, and to permit persons to whom the
  9 +Software is furnished to do so, subject to the following
  10 +conditions:
  11 +
  12 +The above copyright notice and this permission notice shall be
  13 +included in all copies or substantial portions of the Software.
  14 +
  15 +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
  16 +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
  17 +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
  18 +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
  19 +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
  20 +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  21 +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  22 +OTHER DEALINGS IN THE SOFTWARE.
64 git-flow-completion/README.markdown
Source Rendered
... ... @@ -0,0 +1,64 @@
  1 +git-flow-completion
  2 +===================
  3 +
  4 +Bash and Zsh completion support for [git-flow](http://github.com/nvie/gitflow)
  5 +
  6 +The contained completion routines provide support for completing:
  7 +
  8 + * git-flow init and version
  9 + * feature, hotfix and release branches
  10 + * remote feature, hotfix and release branch names
  11 +
  12 +
  13 +Installation for Bash
  14 +---------------------
  15 +
  16 +To achieve git-flow completion nirvana:
  17 +
  18 + 0. [Install git-completion](http://github.com/bobthecow/git-flow-completion/wiki/Install-Bash-git-completion).
  19 +
  20 + 1. Install this file. Either:
  21 +
  22 + a. Place it in a `bash_completion.d` folder:
  23 +
  24 + * /etc/bash_completion.d
  25 + * /usr/local/etc/bash_completion.d
  26 + * ~/bash_completion.d
  27 +
  28 + b. Or, copy it somewhere (e.g. ~/.git-flow-completion.sh) and put the following line in
  29 + your .bashrc:
  30 +
  31 + source ~/.git-flow-completion.sh
  32 +
  33 + 2. If you are using Git < 1.7.1: Edit git-completion.sh and add the following line to the giant
  34 + $command case in _git:
  35 +
  36 + flow) _git_flow ;;
  37 +
  38 +
  39 +Installation for Zsh
  40 +--------------------
  41 +
  42 +To achieve git-flow completion nirvana:
  43 +
  44 + 0. Update your zsh's git-completion module to the newest verion --
  45 + [available here](http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD).
  46 +
  47 + 1. Install this file. Either:
  48 +
  49 + a. Place it in your .zshrc:
  50 +
  51 + b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
  52 + your .zshrc:
  53 +
  54 + source ~/.git-flow-completion.zsh
  55 +
  56 + c. Or, use this file as an oh-my-zsh plugin.
  57 +
  58 +
  59 +The Fine Print
  60 +--------------
  61 +
  62 +Copyright (c) 2010 [Justin Hileman](http://justinhileman.com)
  63 +
  64 +Distributed under the [MIT License](http://creativecommons.org/licenses/MIT/)
197 git-flow-completion/git-flow-completion.bash
... ... @@ -0,0 +1,197 @@
  1 +#!bash
  2 +#
  3 +# git-flow-completion
  4 +# ===================
  5 +#
  6 +# Bash completion support for [git-flow](http://github.com/nvie/gitflow)
  7 +#
  8 +# The contained completion routines provide support for completing:
  9 +#
  10 +# * git-flow init and version
  11 +# * feature, hotfix and release branches
  12 +# * remote feature, hotfix and release branch names
  13 +#
  14 +#
  15 +# Installation
  16 +# ------------
  17 +#
  18 +# To achieve git-flow completion nirvana:
  19 +#
  20 +# 0. Install git-completion.
  21 +#
  22 +# 1. Install this file. Either:
  23 +#
  24 +# a. Place it in a `bash-completion.d` folder:
  25 +#
  26 +# * /etc/bash-completion.d
  27 +# * /usr/local/etc/bash-completion.d
  28 +# * ~/bash-completion.d
  29 +#
  30 +# b. Or, copy it somewhere (e.g. ~/.git-flow-completion.sh) and put the following line in
  31 +# your .bashrc:
  32 +#
  33 +# source ~/.git-flow-completion.sh
  34 +#
  35 +# 2. If you are using Git < 1.7.1: Edit git-completion.sh and add the following line to the giant
  36 +# $command case in _git:
  37 +#
  38 +# flow) _git_flow ;;
  39 +#
  40 +#
  41 +# The Fine Print
  42 +# --------------
  43 +#
  44 +# Copyright (c) 2010 [Justin Hileman](http://justinhileman.com)
  45 +#
  46 +# Distributed under the [MIT License](http://creativecommons.org/licenses/MIT/)
  47 +
  48 +_git_flow ()
  49 +{
  50 + local subcommands="init feature release hotfix help version"
  51 + local subcommand="$(__git_find_on_cmdline "$subcommands")"
  52 + if [ -z "$subcommand" ]; then
  53 + __gitcomp "$subcommands"
  54 + return
  55 + fi
  56 +
  57 + case "$subcommand" in
  58 + init)
  59 + __git_flow_init
  60 + return
  61 + ;;
  62 + feature)
  63 + __git_flow_feature
  64 + return
  65 + ;;
  66 + release)
  67 + __git_flow_release
  68 + return
  69 + ;;
  70 + hotfix)
  71 + __git_flow_hotfix
  72 + return
  73 + ;;
  74 + *)
  75 + COMPREPLY=()
  76 + ;;
  77 + esac
  78 +}
  79 +
  80 +__git_flow_init ()
  81 +{
  82 + local subcommands="help"
  83 + local subcommand="$(__git_find_on_cmdline "$subcommands")"
  84 + if [ -z "$subcommand" ]; then
  85 + __gitcomp "$subcommands"
  86 + return
  87 + fi
  88 +}
  89 +
  90 +__git_flow_feature ()
  91 +{
  92 + local subcommands="list start finish publish track diff rebase checkout pull help"
  93 + local subcommand="$(__git_find_on_cmdline "$subcommands")"
  94 + if [ -z "$subcommand" ]; then
  95 + __gitcomp "$subcommands"
  96 + return
  97 + fi
  98 +
  99 + case "$subcommand" in
  100 + pull)
  101 + __gitcomp "$(__git_remotes)"
  102 + return
  103 + ;;
  104 + checkout|finish|diff|rebase)
  105 + __gitcomp "$(__git_flow_list_branches 'feature')"
  106 + return
  107 + ;;
  108 + publish)
  109 + __gitcomp "$(comm -23 <(__git_flow_list_branches 'feature') <(__git_flow_list_remote_branches 'feature'))"
  110 + return
  111 + ;;
  112 + track)
  113 + __gitcomp "$(comm -23 <(__git_flow_list_remote_branches 'feature') <(__git_flow_list_branches 'feature'))"
  114 + return
  115 + ;;
  116 + *)
  117 + COMPREPLY=()
  118 + ;;
  119 + esac
  120 +}
  121 +
  122 +__git_flow_release ()
  123 +{
  124 + local subcommands="list start finish track publish help"
  125 + local subcommand="$(__git_find_on_cmdline "$subcommands")"
  126 + if [ -z "$subcommand" ]; then
  127 + __gitcomp "$subcommands"
  128 + return
  129 + fi
  130 +
  131 + case "$subcommand" in
  132 + finish)
  133 + __gitcomp "$(__git_flow_list_branches 'release')"
  134 + return
  135 + ;;
  136 + publish)
  137 + __gitcomp "$(comm -23 <(__git_flow_list_branches 'release') <(__git_flow_list_remote_branches 'release'))"
  138 + return
  139 + ;;
  140 + track)
  141 + __gitcomp "$(comm -23 <(__git_flow_list_remote_branches 'release') <(__git_flow_list_branches 'release'))"
  142 + return
  143 + ;;
  144 + *)
  145 + COMPREPLY=()
  146 + ;;
  147 + esac
  148 +
  149 +}
  150 +
  151 +__git_flow_hotfix ()
  152 +{
  153 + local subcommands="list start finish help"
  154 + local subcommand="$(__git_find_on_cmdline "$subcommands")"
  155 + if [ -z "$subcommand" ]; then
  156 + __gitcomp "$subcommands"
  157 + return
  158 + fi
  159 +
  160 + case "$subcommand" in
  161 + finish)
  162 + __gitcomp "$(__git_flow_list_branches 'hotfix')"
  163 + return
  164 + ;;
  165 + *)
  166 + COMPREPLY=()
  167 + ;;
  168 + esac
  169 +}
  170 +
  171 +__git_flow_prefix ()
  172 +{
  173 + case "$1" in
  174 + feature|release|hotfix)
  175 + git config "gitflow.prefix.$1" 2> /dev/null || echo "$1/"
  176 + return
  177 + ;;
  178 + esac
  179 +}
  180 +
  181 +__git_flow_list_branches ()
  182 +{
  183 + local prefix="$(__git_flow_prefix $1)"
  184 + git branch 2> /dev/null | tr -d ' |*' | grep "^$prefix" | sed s,^$prefix,,
  185 +}
  186 +
  187 +__git_flow_list_remote_branches ()
  188 +{
  189 + local prefix="$(__git_flow_prefix $1)"
  190 + local origin="$(git config gitflow.origin 2> /dev/null || echo "origin")"
  191 + git branch -r 2> /dev/null | sed "s/^ *//g" | grep "^$origin/$prefix" | sed s,^$origin/$prefix,,
  192 +}
  193 +
  194 +# alias __git_find_on_cmdline for backwards compatibility
  195 +if [ -z "`type -t __git_find_on_cmdline`" ]; then
  196 + alias __git_find_on_cmdline=__git_find_subcommand
  197 +fi
332 git-flow-completion/git-flow-completion.zsh
... ... @@ -0,0 +1,332 @@
  1 +#!zsh
  2 +#
  3 +# Installation
  4 +# ------------
  5 +#
  6 +# To achieve git-flow completion nirvana:
  7 +#
  8 +# 0. Update your zsh's git-completion module to the newest verion.
  9 +# From here. http://zsh.git.sourceforge.net/git/gitweb.cgi?p=zsh/zsh;a=blob_plain;f=Completion/Unix/Command/_git;hb=HEAD
  10 +#
  11 +# 1. Install this file. Either:
  12 +#
  13 +# a. Place it in your .zshrc:
  14 +#
  15 +# b. Or, copy it somewhere (e.g. ~/.git-flow-completion.zsh) and put the following line in
  16 +# your .zshrc:
  17 +#
  18 +# source ~/.git-flow-completion.zsh
  19 +#
  20 +# c. Or, use this file as a oh-my-zsh plugin.
  21 +#
  22 +
  23 +_git-flow ()
  24 +{
  25 + local curcontext="$curcontext" state line
  26 + typeset -A opt_args
  27 +
  28 + _arguments -C \
  29 + ':command:->command' \
  30 + '*::options:->options'
  31 +
  32 + case $state in
  33 + (command)
  34 +
  35 + local -a subcommands
  36 + subcommands=(
  37 + 'init:Initialize a new git repo with support for the branching model.'
  38 + 'feature:Manage your feature branches.'
  39 + 'release:Manage your release branches.'
  40 + 'hotfix:Manage your hotfix branches.'
  41 + 'support:Manage your support branches.'
  42 + 'version:Shows version information.'
  43 + )
  44 + _describe -t commands 'git flow' subcommands
  45 + ;;
  46 +
  47 + (options)
  48 + case $line[1] in
  49 +
  50 + (init)
  51 + _arguments \
  52 + -f'[Force setting of gitflow branches, even if already configured]'
  53 + ;;
  54 +
  55 + (version)
  56 + ;;
  57 +
  58 + (hotfix)
  59 + __git-flow-hotfix
  60 + ;;
  61 +
  62 + (release)
  63 + __git-flow-release
  64 + ;;
  65 +
  66 + (feature)
  67 + __git-flow-feature
  68 + ;;
  69 + esac
  70 + ;;
  71 + esac
  72 +}
  73 +
  74 +__git-flow-release ()
  75 +{
  76 + local curcontext="$curcontext" state line
  77 + typeset -A opt_args
  78 +
  79 + _arguments -C \
  80 + ':command:->command' \
  81 + '*::options:->options'
  82 +
  83 + case $state in
  84 + (command)
  85 +
  86 + local -a subcommands
  87 + subcommands=(
  88 + 'start:Start a new release branch.'
  89 + 'finish:Finish a release branch.'
  90 + 'list:List all your release branches. (Alias to `git flow release`)'
  91 + )
  92 + _describe -t commands 'git flow release' subcommands
  93 + _arguments \
  94 + -v'[Verbose (more) output]'
  95 + ;;
  96 +
  97 + (options)
  98 + case $line[1] in
  99 +
  100 + (start)
  101 + _arguments \
  102 + -F'[Fetch from origin before performing finish]'\
  103 + ':version:__git_flow_version_list'
  104 + ;;
  105 +
  106 + (finish)
  107 + _arguments \
  108 + -F'[Fetch from origin before performing finish]' \
  109 + -s'[Sign the release tag cryptographically]'\
  110 + -u'[Use the given GPG-key for the digital signature (implies -s)]'\
  111 + -m'[Use the given tag message]'\
  112 + -p'[Push to $ORIGIN after performing finish]'\
  113 + ':version:__git_flow_version_list'
  114 + ;;
  115 +
  116 + *)
  117 + _arguments \
  118 + -v'[Verbose (more) output]'
  119 + ;;
  120 + esac
  121 + ;;
  122 + esac
  123 +}
  124 +
  125 +__git-flow-hotfix ()
  126 +{
  127 + local curcontext="$curcontext" state line
  128 + typeset -A opt_args
  129 +
  130 + _arguments -C \
  131 + ':command:->command' \
  132 + '*::options:->options'
  133 +
  134 + case $state in
  135 + (command)
  136 +
  137 + local -a subcommands
  138 + subcommands=(
  139 + 'start:Start a new hotfix branch.'
  140 + 'finish:Finish a hotfix branch.'
  141 + 'list:List all your hotfix branches. (Alias to `git flow hotfix`)'
  142 + )
  143 + _describe -t commands 'git flow hotfix' subcommands
  144 + _arguments \
  145 + -v'[Verbose (more) output]'
  146 + ;;
  147 +
  148 + (options)
  149 + case $line[1] in
  150 +
  151 + (start)
  152 + _arguments \
  153 + -F'[Fetch from origin before performing finish]'\
  154 + ':hotfix:__git_flow_version_list'\
  155 + ':branch-name:__git_branch_names'
  156 + ;;
  157 +
  158 + (finish)
  159 + _arguments \
  160 + -F'[Fetch from origin before performing finish]' \
  161 + -s'[Sign the release tag cryptographically]'\
  162 + -u'[Use the given GPG-key for the digital signature (implies -s)]'\
  163 + -m'[Use the given tag message]'\
  164 + -p'[Push to $ORIGIN after performing finish]'\
  165 + ':hotfix:__git_flow_hotfix_list'
  166 + ;;
  167 +
  168 + *)
  169 + _arguments \
  170 + -v'[Verbose (more) output]'
  171 + ;;
  172 + esac
  173 + ;;
  174 + esac
  175 +}
  176 +
  177 +__git-flow-feature ()
  178 +{
  179 + local curcontext="$curcontext" state line
  180 + typeset -A opt_args
  181 +
  182 + _arguments -C \
  183 + ':command:->command' \
  184 + '*::options:->options'
  185 +
  186 + case $state in
  187 + (command)
  188 +
  189 + local -a subcommands
  190 + subcommands=(
  191 + 'start:Start a new feature branch.'
  192 + 'finish:Finish a feature branch.'
  193 + 'list:List all your feature branches. (Alias to `git flow feature`)'
  194 + 'publish: public'
  195 + 'track: track'
  196 + 'diff: diff'
  197 + 'rebase: rebase'
  198 + 'checkout: checkout'
  199 + 'pull: pull'
  200 + )
  201 + _describe -t commands 'git flow feature' subcommands
  202 + _arguments \
  203 + -v'[Verbose (more) output]'
  204 + ;;
  205 +
  206 + (options)
  207 + case $line[1] in
  208 +
  209 + (start)
  210 + _arguments \
  211 + -F'[Fetch from origin before performing finish]'\
  212 + ':feature:__git_flow_feature_list'\
  213 + ':branch-name:__git_branch_names'
  214 + ;;
  215 +
  216 + (finish)
  217 + _arguments \
  218 + -F'[Fetch from origin before performing finish]' \
  219 + -r'[Rebase instead of merge]'\
  220 + ':feature:__git_flow_feature_list'
  221 + ;;
  222 +
  223 + (publish)
  224 + _arguments \
  225 + ':feature:__git_flow_feature_list'\
  226 + ;;
  227 +
  228 + (track)
  229 + _arguments \
  230 + ':feature:__git_flow_feature_list'\
  231 + ;;
  232 +
  233 + (diff)
  234 + _arguments \
  235 + ':branch:__git_branch_names'\
  236 + ;;
  237 +
  238 + (rebase)
  239 + _arguments \
  240 + -i'[Do an interactive rebase]' \
  241 + ':branch:__git_branch_names'
  242 + ;;
  243 +
  244 + (checkout)
  245 + _arguments \
  246 + ':branch:__git_flow_feature_list'\
  247 + ;;
  248 +
  249 + (pull)
  250 + _arguments \
  251 + ':remote:__git_remotes'\
  252 + ':branch:__git_branch_names'
  253 + ;;
  254 +
  255 + *)
  256 + _arguments \
  257 + -v'[Verbose (more) output]'
  258 + ;;
  259 + esac
  260 + ;;
  261 + esac
  262 +}
  263 +
  264 +__git_flow_version_list ()
  265 +{
  266 + local expl
  267 + declare -a versions
  268 +
  269 + versions=(${${(f)"$(_call_program versions git flow release list 2> /dev/null | tr -d ' |*')"}})
  270 + __git_command_successful || return
  271 +
  272 + _wanted versions expl 'version' compadd $versions
  273 +}
  274 +
  275 +__git_flow_feature_list ()
  276 +{
  277 + local expl
  278 + declare -a features
  279 +
  280 + features=(${${(f)"$(_call_program features git flow feature list 2> /dev/null | tr -d ' |*')"}})
  281 + __git_command_successful || return
  282 +
  283 + _wanted features expl 'feature' compadd $features
  284 +}
  285 +
  286 +__git_remotes () {
  287 + local expl gitdir remotes
  288 +
  289 + gitdir=$(_call_program gitdir git rev-parse --git-dir 2>/dev/null)
  290 + __git_command_successful || return
  291 +
  292 + remotes=(${${(f)"$(_call_program remotes git config --get-regexp '"^remote\..*\.url$"')"}//#(#b)remote.(*).url */$match[1]})
  293 + __git_command_successful || return
  294 +
  295 + # TODO: Should combine the two instead of either or.
  296 + if (( $#remotes > 0 )); then
  297 + _wanted remotes expl remote compadd $* - $remotes
  298 + else
  299 + _wanted remotes expl remote _files $* - -W "($gitdir/remotes)" -g "$gitdir/remotes/*"
  300 + fi
  301 +}
  302 +
  303 +__git_flow_hotfix_list ()
  304 +{
  305 + local expl
  306 + declare -a hotfixes
  307 +
  308 + hotfixes=(${${(f)"$(_call_program hotfixes git flow hotfix list 2> /dev/null | tr -d ' |*')"}})
  309 + __git_command_successful || return
  310 +
  311 + _wanted hotfixes expl 'hotfix' compadd $hotfixes
  312 +}
  313 +
  314 +__git_branch_names () {
  315 + local expl
  316 + declare -a branch_names
  317 +
  318 + branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
  319 + __git_command_successful || return
  320 +
  321 + _wanted branch-names expl branch-name compadd $* - $branch_names
  322 +}
  323 +
  324 +__git_command_successful () {
  325 + if (( ${#pipestatus:#0} > 0 )); then
  326 + _message 'not a git repository'
  327 + return 1
  328 + fi
  329 + return 0
  330 +}
  331 +
  332 +zstyle ':completion:*:*:git:*' user-commands flow:'description for foo'
1  zsh/config
@@ -39,6 +39,7 @@ HISTSIZE=10000
39 39 REPORTTIME=10 # Show elapsed time if command took more than X seconds
40 40 LISTMAX=0 # ask to complete if top of list would scroll off screen
41 41
  42 +fpath=(~/bin/dotfiles/zsh/local_funcs $fpath)
42 43 # Load completions for Ruby, Git, etc.
43 44 autoload compinit
44 45 compinit
6,029 zsh/local_funcs/_git
6,029 additions, 0 deletions not shown
4 zshrc
@@ -5,6 +5,8 @@
5 5 . ~/bin/dotfiles/bash/aliases
6 6 . ~/bin/dotfiles/zsh/config
7 7
  8 +source ~/bin/dotfiles/git-flow-completion/git-flow-completion.zsh
  9 +
8 10 # rvm-install added line:
9   -if [[ -s /Users/rick/.rvm/scripts/rvm ]] ; then source /Users/rick/.rvm/scripts/rvm ; fi
  11 +if [[ -s /Users/rickd/.rvm/scripts/rvm ]] ; then source /Users/rickd/.rvm/scripts/rvm ; fi
10 12

0 comments on commit 4bd70ad

Please sign in to comment.
Something went wrong with that request. Please try again.