diff options
| author | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
|---|---|---|
| committer | Chris McCuller <cmcculler@salesforce.com> | 2015-09-21 22:19:15 -0400 |
| commit | e6ccd37b0563b4e7b34c41034766b9789e43ee5c (patch) | |
| tree | c12c8c2c6437fd7d5d3ec5bff27634a80759b808 /plugins/docker-compose/docker-compose.plugin.zsh | |
| parent | 30ef85664822595e29acdbc840c45d5772d84b5d (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.gz zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.tar.bz2 zsh-e6ccd37b0563b4e7b34c41034766b9789e43ee5c.zip | |
Merge master (rebase being super annoying). Fix conflicts
Diffstat (limited to 'plugins/docker-compose/docker-compose.plugin.zsh')
| -rw-r--r-- | plugins/docker-compose/docker-compose.plugin.zsh | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/plugins/docker-compose/docker-compose.plugin.zsh b/plugins/docker-compose/docker-compose.plugin.zsh deleted file mode 100644 index 08500408d..000000000 --- a/plugins/docker-compose/docker-compose.plugin.zsh +++ /dev/null @@ -1,14 +0,0 @@ -# Authors: -# https://github.com/tristola -# -# Docker-compose related zsh aliases - -# Aliases ################################################################### - -alias dcup='docker-compose up' -alias dcb='docker-compose build' -alias dcrm='docker-compose rm' -alias dcps='docker-compose ps' -alias dcstop='docker-compose stop' -alias dcrestart='docker-compose restart' - |