diff options
| author | Trae Robrock <trobrock@gmail.com> | 2011-12-20 18:15:19 -0800 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-12-02 12:30:46 -0800 |
| commit | fe094712fb0c896eeec55b686807011226bc9208 (patch) | |
| tree | a6a040e360f5dc6dff0233272c010c849a18a90d | |
| parent | b2b77be56f35a9753e7491fd88b3c4b7ec74c586 (diff) | |
| download | zsh-fe094712fb0c896eeec55b686807011226bc9208.tar.gz zsh-fe094712fb0c896eeec55b686807011226bc9208.tar.bz2 zsh-fe094712fb0c896eeec55b686807011226bc9208.zip | |
resolving conflict in termsupport plugin
| -rw-r--r-- | lib/termsupport.zsh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index 4701e46c5..c056989eb 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -26,7 +26,7 @@ function omz_termsupport_precmd { function omz_termsupport_preexec { emulate -L zsh setopt extended_glob - local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd + local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]} #cmd name only, or if this is sudo or ssh, the next cmd title "$CMD" "%100>...>${2:gs/%/%%}%<<" } |