Commit Graph
100 Commits
Author SHA1 Message Date
Robby Russell 2a0c1d7b92 Merge pull request #1711 from bertabus/master
Vundle clean function
2013-04-11 14:56:36 -07:00
Robby Russell 0198a12953 Merge pull request #1699 from Bercio/patch-1
>! doesn't work with noclobber. changed >! to >| and  echo "$PWD" to pwd(redundant)
2013-04-08 12:43:43 -07:00
Robby Russell 4300b63462 Merge pull request #1689 from afh/pull/emoji_clock
Add emoji-clock plugin
2013-04-08 12:42:43 -07:00
Robby Russell 989b6ec29e Merge pull request #1208 from jaischeema/master
Add new theme : jaischeema
2013-04-07 19:32:41 -07:00
Robby Russell b68db6e15a Merge pull request #1060 from danielbayerlein/new-theme-inspired-by-peepcode
Add Theme "itchy"
2013-04-07 19:31:54 -07:00
Robby Russell 7e046d320f Merge pull request #729 from doitian/plugin_tmuxinator
tmuxinator completion
2013-04-07 19:30:30 -07:00
Robby Russell b2421cc73f 005d967dc4 2013-04-07 19:26:40 -07:00
Robby Russell b57284244e Merge pull request #1632 from jmatth/tmux_plugin
Adding Tmux Plugin
2013-04-07 19:08:44 -07:00
Robby Russell 2d0c9e771d Merge pull request #1652 from z2v/master
Add useful aliases accompanying 'push/pull' activites
2013-04-07 19:06:45 -07:00
Robby Russell cd55560c74 Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6
parse_git_dirty() support for Git 1.6
2013-04-07 19:06:31 -07:00
Robby Russell dda1154c80 Merge pull request #1655 from nubs/phing-and-cache-files
Improve portability of cache file detection for command targets
2013-04-07 19:05:59 -07:00
Robby Russell e041b50742 Merge pull request #1656 from hacfi/patch-2
Autocomplete composer default methods if composer.json is not available
2013-04-07 19:05:08 -07:00
Robby Russell 037b691c19 Merge pull request #1665 from bmcorser/patch-1
Alias for commit and commit all with amend
2013-04-07 19:04:45 -07:00
Robby Russell 2606772676 Merge pull request #1679 from KokaKiwi/master
A new plugin "colored-man" and a greeny theme "kiwi"
2013-04-07 19:03:39 -07:00
Robby Russell 3726c49596 Merge pull request #1680 from zbrox/master
Powify autocomplete
2013-04-07 19:02:58 -07:00
Robby Russell eadca724b7 Merge pull request #1681 from akre54/add-bower
add bower autocompletion
2013-04-07 19:02:24 -07:00
Robby Russell 0169654bf0 Merge pull request #1685 from justinclayton/patch-1
Update _vagrant
2013-04-07 19:01:54 -07:00
Robby Russell b95c0e827b Merge pull request #1686 from timsly/hub-autocomplete
added hub autocomplete instructions
2013-04-07 19:01:42 -07:00
Robby Russell 3dc073a542 Merge pull request #1690 from docwhat/git-untracked
This fixes checking for git untracked items
2013-04-07 19:00:22 -07:00
Robby Russell 601d4d6efc Merge pull request #1662 from rylwin/patch-1
last-working-dir: Use >! to overwrite $cache_file
2013-04-07 18:58:50 -07:00
Robby Russell ca384067e6 Merge pull request #1674 from simeonwillbanks/master
Fixes #1485 Zeus should not be bundled
2013-04-07 18:58:03 -07:00
Robby Russell 77ca980bfa Merge pull request #1678 from lesmyrmidons/symfony2
Symfony2
2013-04-07 18:57:21 -07:00
Robby Russell 1d66bef550 Merge pull request #1682 from maplebed/ben.knife
Allow you to customize the path to knife config files
2013-04-07 18:57:00 -07:00
Robby Russell b906454238 Merge pull request #1691 from gianu/master
NEW THEME: gianu
2013-04-07 18:54:19 -07:00
Robby Russell 397d4ae1f2 Merge pull request #1697 from dsx/sublime-plugin-fix
Prevents echo of _sublime_darwin_paths contents on zsh startup
2013-04-07 18:51:18 -07:00
Robby Russell ac0dddb1fc Merge pull request #1698 from ConradIrwin/safe-paste
safe-paste plugin
2013-04-07 18:51:03 -07:00
Robby Russell b8b241f630 Merge pull request #749 from blueyed/setopt-correct
Only `setopt correct`, not "correct_all".
2013-03-26 22:14:20 -07:00
Robby Russell 5e7e987ff7 Merge pull request #1657 from ysmood/master
Add a new theme 'ys'
2013-03-26 22:12:48 -07:00
Robby Russell 95b46e7eac Merge pull request #1658 from kavu/patch-1
Fix git dirty status in dallas.zsh-theme
2013-03-26 22:12:21 -07:00
Robby Russell d9bf1adca6 Merge pull request #1659 from AshleyS/master
Fixed base64 decode parameter for newer versions of base64 binary
2013-03-26 22:12:01 -07:00
Robby Russell 5cde893ce0 Merge pull request #1661 from hellerbarde/master
Fix some problems with git enabled prompts where they *always* claim to have untracked files
2013-03-26 22:11:04 -07:00
Robby Russell 4e101bed86 Merge pull request #1558 from sbooob/master
Mercurial repository info in agnoster theme
2013-03-26 22:05:55 -07:00
Robby Russell 2239035368 Merge pull request #1573 from flz/master
Add new profiles plugin.
2013-03-26 22:02:45 -07:00
Robby Russell 9276b5f8ac Merge pull request #1595 from nevir/sublime3-support
Support for Sublime Text 3, with fallback
2013-03-26 22:01:31 -07:00
Robby Russell 6f72d6c17c Merge pull request #1598 from zasdfgbnm/master
new plugin
2013-03-26 22:00:52 -07:00
Robby Russell c867684fe1 Merge pull request #1607 from gekken/master
added ruby 2.0.0 to rvm plugin
2013-03-26 21:59:48 -07:00
Robby Russell 5b7f49e6c6 Merge pull request #1610 from mcaserta/scala_and_sbt_plugins
SBT and Scala plugins.
2013-03-26 21:58:22 -07:00
Robby Russell ed69d1e736 Merge pull request #1611 from ripdog/patch-1
Update plugins/extract/extract.plugin.zsh
2013-03-26 21:57:54 -07:00
Robby Russell eabf51e0fe Merge pull request #1614 from miklos-martin/bower
Bower plugin
2013-03-26 21:57:26 -07:00
Robby Russell a3a6b91818 Merge pull request #1616 from sxeraverx/master
pipe git version check error to /dev/null (for when git doesn't exist)
2013-03-26 21:56:35 -07:00
Robby Russell d3d3f0e8b9 Merge pull request #1524 from bonifaido/master
Maven plugin completion fix for other (than Java) JVM languages and/or missing test cases folder
2013-03-26 21:51:32 -07:00
Robby Russell 280c3df90e Merge pull request #1638 from RomainBelorgey/master
Use completion if file Capfile
2013-03-26 21:49:03 -07:00
Robby Russell 74859240be Merge pull request #1650 from ishtu/master
add vncviewer function (using "open" functionality)
2013-03-26 21:48:36 -07:00
Robby Russell 650bace5c5 Merge pull request #1663 from flavius/master
allow setting a custom HISTFILE before oh-my-zsh is loaded
2013-03-26 21:47:58 -07:00
Robby Russell b0d80a0175 Merge pull request #1664 from marcel-wolf/master
add ssh-agent option to set default lifetime for identities
2013-03-26 21:47:00 -07:00
Robby Russell 0b5d983897 Merge pull request #1668 from sheerun/patch-1
Use --no-rehash option for faster startup
2013-03-26 21:46:31 -07:00
Robby Russell 6a8e79fda0 Merge pull request #1669 from desimone/master
support for Go (golang) completions
2013-03-26 21:46:06 -07:00
Robby Russell 2c069885cc Merge pull request #1671 from lifinsky/master
Fix grails plugin
2013-03-26 21:45:13 -07:00
Robby Russell 0ab0e67ecf Merge pull request #1645 from mbologna/master
a new theme, different from the already existent themes :)
2013-03-06 06:15:25 -08:00
Robby Russell fce68bbba0 Merge pull request #1594 from jbhannah/rbenv-gems-fix
Fix rbenv gems helper
2013-02-09 11:55:30 -08:00
Robby Russell 1a362c11a8 Merge pull request #1583 from To1ne/pj.plugin
added pj.plugin
2013-02-09 11:55:03 -08:00
Robby Russell 6e6cf43037 Merge pull request #1586 from HeroicEric/master
add rspec alias to zeus plugin
2013-02-07 19:30:03 -08:00
Robby Russell 615e41b0ec Adding MIT-LICENSE Closes #655 2013-01-15 06:45:27 -08:00
Robby Russell cf03ee6d88 Merge pull request #1534 from gberenfield/master
Tested fix for Issue #1479
2013-01-10 22:39:37 -08:00
Robby Russell 312da3ea05 Merge pull request #941 from dcreager/configurable-blinks-theme
blinks theme works with light and dark Solarized
2013-01-10 22:37:25 -08:00
Robby Russell 9ef7e8a191 Merge pull request #1077 from Mezzle/add-option-to-show-git-status
Add option to disable status notification
2013-01-10 22:36:16 -08:00
Robby Russell a634d50645 Merge pull request #1054 from ptillemans/master
Updated subcommands for leiningen plugin
2013-01-10 22:34:23 -08:00
Robby Russell 64db7b56f2 Merge pull request #1164 from fuksito/master
More usable aliases
2013-01-10 22:33:47 -08:00
Robby Russell ae7bce34fd Merge pull request #837 from stacksmashing/master
Fix sprunge-plugin behaviour.
2013-01-10 22:32:26 -08:00
Robby Russell 80a6032596 Merge pull request #1510 from agnoster/agnoster-classic
agnoster "classic"
2012-12-31 05:27:46 -08:00
Robby Russell 07c19b66d3 Merge pull request #1517 from thisiskun/master
provide the unbundled commands
2012-12-31 05:26:40 -08:00
Robby Russell c5ecb4e136 Fixes #1489
Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"

This reverts commit 8f89d4d5a5.
2012-12-31 05:25:07 -08:00
Robby Russell 397c085a19 Merge pull request #1473 from bsteuber/fix-git-flow-feature-completion
use feature names instead of failing branch names in "git flow feature"
2012-12-09 09:04:02 -08:00
Robby Russell bc7157ba75 Merge pull request #1475 from westonplatter/master
fixes #1474 add zeus to bundle exec list
2012-12-09 09:03:32 -08:00
Robby Russell d8162cdded Merge pull request #1477 from madsgraphics/git_prompt_showstashstate
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
2012-12-09 09:03:02 -08:00
Robby Russell 6d7a275972 Merge pull request #1084 from avit/bwana-plugin
Bwana plugin for reading man pages in the browser
2012-12-05 07:21:33 -08:00
Robby Russell 046fc5a1d8 Merge pull request #1133 from mappleconfusers/605ad8725b06cc15f8523404f59060b6a71bb7a2
Cat alias: :3
2012-12-05 07:19:18 -08:00
Robby Russell 083da66c0b Merge pull request #1139 from mappleconfusers/pull_req_git
Add aliases for git-remote
2012-12-05 07:16:36 -08:00
Robby Russell ed5d2fff1f Merge pull request #1233 from mugenken/knife-check-cwd
check for knife.rb in cwd
2012-12-05 07:15:34 -08:00
Robby Russell dc2558c52d Merge pull request #1467 from timothyandrew/patch-1
Added a `migrate` alias.
2012-12-05 07:14:29 -08:00
Robby Russell 4154eccb31 Merge pull request #1468 from larrylv/unset-config-file-variable
Unset `config_file` variable in oh-my-zsh.sh
2012-12-05 07:14:13 -08:00
Robby Russell 178bce287e Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-04 08:27:13 -08:00
Robby Russell 0118b5b759 Merge pull request #1248 from grahamc/add-symfony
Adding a symfony plugin, for symfony 1
2012-12-04 06:56:59 -08:00
Robby Russell 78e3f38db7 Merge pull request #1258 from caio/git-branch-status
Add branch status support to git_prompt_status
2012-12-04 06:56:43 -08:00
Robby Russell d100354d0d Merge pull request #778 from rschmukler/plugin-osx
Added vsplit_tab and split_tab for iTerm.
2012-12-04 06:55:25 -08:00
Robby Russell 462136a9d6 Merge pull request #794 from markdrago/cloud_parameter
add ability to set custom prefix for cloud theme
2012-12-04 06:52:32 -08:00
Robby Russell 5aed0aed4e Merge pull request #875 from ttddyy/prompt_git-remove
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
Robby Russell d88fad3392 Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
Fixed Mac OS X Terminal.app related issue with extra newlines echoed
2012-12-04 06:45:01 -08:00
Robby Russell 24188fda80 Merge pull request #1181 from paulmars/master
Plugin for git_remote_branch autocomplete.
2012-12-04 06:39:49 -08:00
Robby Russell dbeb74ece8 Merge pull request #1189 from petemounce/yum-quote
Fix mismatched quote in yum plugin
2012-12-04 06:38:41 -08:00
Robby Russell 5f41ecd7b8 Merge pull request #1186 from r-darwish/history
Added history plugin
2012-12-04 06:38:28 -08:00
Robby Russell bd9a86051f Merge pull request #1247 from drnic/git-cmds
Added 'gcl'for 'git config --list'; and gd for 'git diff'
2012-12-04 06:37:18 -08:00
Robby Russell 421a738b49 Merge pull request #1273 from ystein/master
Typo in cd-wrapper
2012-12-04 06:36:45 -08:00
Robby Russell 63deae380c Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-04 06:36:08 -08:00
Robby Russell 868a5138f6 Resolving conflict in merge of #1313 2012-12-04 06:35:59 -08:00
Robby Russell 3199d2ed8d Merge pull request #1387 from jimhester/vi-mode-patch
Fixes for vi-mode terminal overwriting bugs
2012-12-04 06:34:02 -08:00
Robby Russell 43ca5d8cbe Merge pull request #1458 from ranman/master
lazyload virtualenvwrapper
2012-12-04 06:33:41 -08:00
Robby Russell 9ae128983a Merge pull request #1454 from gAmUssA/patch-4
Update plugins/sublime/sublime.plugin.zsh
2012-12-04 06:33:13 -08:00
Robby Russell b204ce8f67 Merge pull request #1462 from aliasbind/master
Add last command's 'exit status' display to mortalscumbag theme
2012-12-03 07:26:25 -08:00
Robby Russell 26b3e1015d Merge pull request #1460 from tresni/patch-4
urltools for everyone
2012-12-03 07:25:51 -08:00
Robby Russell 2f0717cb76 Merge pull request #1459 from tresni/patch-3
Backwards Compatible Jira URLs #1378
2012-12-03 07:25:35 -08:00
Robby Russell 1ad2104d7a Merge pull request #1463 from syphar/fix_last_working_dir
plugin last-working-dir: create cache-directory if it doesn't exist
2012-12-03 07:25:08 -08:00
Robby Russell 5193a1dbc9 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 13:11:02 -08:00
Robby Russell f8343b0fd9 Merge pull request #1457 from NeuralSandwich/master
Battery plugin: Fixed Kernel type detection
2012-12-02 13:08:30 -08:00
Robby Russell 13998bb2cc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 13:08:12 -08:00
Robby Russell fcc8b19253 Merge pull request #1328 from mfoo/master
Fix autojump plugin error on Linux with manual installation of autojump
2012-12-02 13:05:28 -08:00
Robby Russell 228c3fc89f Merge pull request #1301 from bencao/master
fix rvm plugin auto complete not work problem
2012-12-02 13:04:14 -08:00
Robby Russell ef4e2aa26d Merge pull request #1293 from cenkalti/master
Look virtualenvwrapper plugin in PATH
2012-12-02 13:03:28 -08:00
Robby Russell fdf3a3998f Merge pull request #1295 from XL64/master
Fixed johnathan-zsh.theme if rbenv doesn't exists
2012-12-02 13:02:38 -08:00
Robby Russell 1f284071de Merge pull request #1298 from nickhutchinson/fishy
Update fishy theme to collapse working directory in PROMPT
2012-12-02 13:02:22 -08:00