diff options
| author | Robby Russell <robby@planetargon.com> | 2009-10-26 09:24:37 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2009-10-26 09:24:37 -0700 |
| commit | fd6861b8cd3ff12162d89babf27945a50d739ca8 (patch) | |
| tree | fe3515fe59ed7e92da25bba061e9623c45cde242 /lib | |
| parent | 11220ca4959b36f9676f68389bd5b0c8825d6c44 (diff) | |
| download | zsh-fd6861b8cd3ff12162d89babf27945a50d739ca8.tar.gz zsh-fd6861b8cd3ff12162d89babf27945a50d739ca8.tar.bz2 zsh-fd6861b8cd3ff12162d89babf27945a50d739ca8.zip | |
Fixing some conflict residue that I missed in a commit/merge:
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/aliases.zsh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/aliases.zsh b/lib/aliases.zsh index c4428d405..928677347 100644 --- a/lib/aliases.zsh +++ b/lib/aliases.zsh @@ -10,6 +10,8 @@ alias sd='ruby script/destroy' alias sp='ruby script/plugin' alias ssp='ruby script/spec' alias rdbm='rake db:migrate' +alias sc='ruby script/console' +alias sd='ruby script/server --debugger' # Basic directory operations alias .='pwd' @@ -62,15 +64,6 @@ alias et='mate . &' alias ett='mate app config lib db public spec test Rakefile Capfile Todo &' alias etp='mate app config lib db public spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' alias etts='mate app config lib db public script spec test vendor/plugins vendor/gems Rakefile Capfile Todo &' -<<<<<<< HEAD:lib/aliases.zsh -======= - -## Ruby related -# Ruby scripts -alias sc='ruby script/console' -alias sd='ruby script/server --debugger' # Editor Ruby file in TextMate -alias mr='mate CHANGELOG app config db lib public script spec test' - ->>>>>>> 886d97f41e72b8662232a2c6b196fb60508e4f67:lib/aliases.zsh +alias mr='mate CHANGELOG app config db lib public script spec test'
\ No newline at end of file |