Commit Graph
100 Commits
Author SHA1 Message Date
Robby Russell e30a1243dc Merge pull request #2220 from nishigori/fix-bad-ps-syntax
When using ssh-agent plugin, It output a warning message
2013-11-04 16:31:52 -08:00
Robby Russell b2376c3770 Merge pull request #1529 from aquaplanet/fix-sshagent-openbsd
Fix ssh-agent plugin for OpenBSD, making it more portable
2013-11-04 12:29:42 -08:00
Robby Russell 0d36ecfe38 Merge pull request #2174 from oxnz/master
plugins/osx/osx.plugin.zsh: add itunes function to control itnues from the terminal
2013-11-02 10:35:18 -07:00
Robby Russell 90c28b786a Merge pull request #1688 from mbauhardt/z
ohmyzsh plugin of the z project: https://github.com/rupa/z
2013-10-24 20:29:10 -07:00
Robby Russell 042ee6e6ed Merge pull request #2138 from Profpatsch/theme-agnoster
More expressive symbols for git and mercurial.
2013-10-24 20:28:22 -07:00
Robby Russell 9f88fb5229 Merge pull request #2165 from kevinxucs/custom-gitignore-fix
gitignore fix for custom folder.
2013-10-24 20:26:20 -07:00
Robby Russell e44c147e25 Merge pull request #1963 from shajra/pr/gpg-fix
fix gpg-agent "running already" check
2013-10-24 20:25:33 -07:00
Robby Russell 86d57e83ed Merge pull request #2078 from tbuehl/master
Add commonly used git stash aliases to git plugin
2013-10-24 20:24:59 -07:00
Robby Russell 07ad2bad66 Merge pull request #2192 from kevintraver/tmux-aliases
Add tmux aliases
2013-10-24 20:23:40 -07:00
Robby Russell 6533dc6b41 Merge pull request #2184 from jmagnusson/agnoster_respect_venv_disable_prompt
Fix: Agnoster theme doesn't respect VIRTUAL_ENV_DISABLE_PROMPT
2013-10-24 20:23:15 -07:00
Robby Russell 8f2e53c33e Merge pull request #2107 from maxd/master
Check bundler version to avoid error with unsupported command line arguments
2013-10-24 13:13:10 -07:00
Robby Russell c79e5a97a9 Merge pull request #2132 from jkaving/forklift2
Add support for ForkLift 2 to the ForkLift plugin
2013-10-08 19:26:28 -07:00
Robby Russell bbe4ea54fd Merge pull request #2139 from deiga/patch-1
Added '.war' extension to unzip
2013-10-08 19:25:17 -07:00
Robby Russell a8efe61d53 Merge pull request #2145 from futjikato/master
Added gitignore.io custom plugin
2013-10-08 19:24:27 -07:00
Robby Russell 61e3951e4b Revert "Replace no unicode glyph on hexa string"
This reverts commit baffc3b0bd.
2013-09-19 13:18:16 -07:00
Robby Russell b57118bd37 Merge pull request #2065 from prudprud/master
Replace no unicode glyph on hexa string
2013-09-19 07:00:16 -07:00
Robby Russell 0582bd193c Merge pull request #1763 from jonilicious/master
RVM plugin - Fixes wrong variable used in 'rb20' function
2013-09-19 06:58:51 -07:00
Robby Russell 26e936e645 Merge pull request #1967 from tchaudhri/gdc_git_alias
Added a 'git diff --cached' alias -> 'gdc'
2013-09-19 06:56:58 -07:00
Robby Russell 4275e68bb3 Merge pull request #2079 from paulmelnikow/subl
Sublime Text: Harmonize alias with the Sublime Text install instructions
2013-09-19 06:56:35 -07:00
Robby Russell 9d93608740 Merge pull request #2077 from paulmelnikow/nvm
Plugin for Node Version Manager
2013-09-19 06:52:42 -07:00
Robby Russell ea4d3367b9 Merge pull request #2060 from dchusovitin/bug-node-doc
Fixed opening documentation on Linux (node)
2013-09-19 06:50:05 -07:00
Robby Russell 91c9d98bd8 Merge pull request #2066 from agronemann/patch-1
Update bundler.plugin.zsh
2013-09-19 06:49:28 -07:00
Robby Russell 88c9d0113a Merge pull request #2087 from Stibbons/gsemet_push_theme_chooser
Display right prompt in theme chooser
2013-09-19 06:48:55 -07:00
Robby Russell d5701784b0 Merge pull request #2098 from monstermunchkin/master
jump plugin: fix autocompletion with single mark
2013-09-19 06:48:13 -07:00
Robby Russell d72ebc0824 Merge pull request #2043 from quodlibetor/fix-pip
Improve pip plugin options support
2013-09-18 23:39:59 -07:00
Robby Russell fc70d76788 Merge pull request #2053 from fluxrad/mosh
Add support for mosh (remote-shell) tab completion.
2013-09-18 23:39:12 -07:00
Robby Russell 19e1a3e1ef Merge pull request #2093 from zdevex/fixCommentsInTemplate
Fixed comments in zshrc.zsh-template about disabling auto updates.
2013-09-18 23:38:50 -07:00
Robby Russell a712579a2a Merge pull request #2099 from mchaisse/master
Added WIP (work in progress) feature to git.plugin
2013-09-18 23:38:11 -07:00
Robby Russell ac58ffdf66 Merge pull request #1840 from yleo77/master
About gf alias
2013-09-18 23:37:28 -07:00
Robby Russell b51c2a0d0b Merge pull request #1987 from zvirusz/patch-1
Added 'reinstall' command to brew completion
2013-09-11 06:20:22 -07:00
Robby Russell 045323160a Merge pull request #2002 from stibinator/master
added duckduckduck go to the web-search plugin
2013-09-11 06:20:10 -07:00
Robby Russell 475fb3a29b Merge pull request #1829 from docwhat/compinit
Create the zcompdump based on version and host
2013-09-11 06:19:43 -07:00
Robby Russell 1c468c63c0 Merge pull request #839 from eproxus/sunrise-fixes
Correct color and font issues on Ubuntu
2013-09-11 06:18:46 -07:00
Robby Russell e99a8fb9c2 Merge pull request #2080 from Mehonoshin/bundler-parallel-installing
Support of parallel bundle install
2013-09-11 06:16:30 -07:00
Robby Russell cf4eded921 Merge pull request #1975 from fff/master
fix typo error in tmux plugin
2013-09-11 06:15:26 -07:00
Robby Russell dff966afad Logo draft 1... 2013-09-06 16:00:24 -07:00
Robby Russell d7b594e5cd Merge pull request #2045 from jeroenjanssens/master
Add jump plugin, which allows you to easily jump around the file system
2013-09-06 14:35:00 -07:00
Robby Russell 434f3bc05c Merge pull request #2028 from AeonAxan/master
Add Docker Autocompleteion
2013-08-13 06:21:53 -07:00
Robby Russell f6dbe212e8 Merge pull request #1672 from miry/rails3_command_fix
Use new style of rails command.
2013-08-13 06:21:14 -07:00
Robby Russell 39a5e36c37 Merge pull request #1790 from simlegate/master
change git  alias
2013-08-13 06:20:53 -07:00
Robby Russell 00183d1199 Merge pull request #1961 from brenttheisen/issue_1952_pr
Copy and paste of two functions from Ubuntu 13.04's version of /usr/s… …hare/zsh/functions/Completion/Unix/_git that were referenced in 46f0d8d.
2013-08-13 06:20:05 -07:00
Robby Russell 89067b5387 Merge pull request #1960 from mekanics/plugin-pod
Plugin pod
2013-08-13 06:18:37 -07:00
Robby Russell 5fcb6e1263 Merge pull request #1988 from jwarwick/mix
Added autocompletion support for Elixir mix command
2013-07-23 07:24:58 -07:00
Robby Russell dde7aefc67 Merge pull request #1992 from jeromemacias/patch-1
Fix symfony command completion 'permission denied'
2013-07-23 07:24:27 -07:00
Robby Russell 34ce86e4c8 Merge pull request #1994 from kennethgeerts/master
Updated gem plugin zsh completion (gem 2.0.3).
2013-07-23 07:23:59 -07:00
Robby Russell a256f7a88e Merge pull request #1993 from zvirusz/patch-2
In capistrano completion show also tasks without description
2013-07-23 07:23:32 -07:00
Robby Russell 2cc4801bd2 Merge pull request #1980 from awidegreen/upstream
Fix ssh-agent plugin identities comment for using multiple identities.
2013-07-16 20:45:19 -07:00
Robby Russell 2aebcb80bb Merge pull request #1981 from trobrock/knife-ssh
Add knife_ssh command to make connecting to servers managed with chef easier
2013-07-16 20:43:45 -07:00
Robby Russell 7f74294d7a Merge pull request #1935 from mateitrusca/master
typo in tmux plugin
2013-07-09 08:53:41 -07:00
Robby Russell b0e4381471 Merge pull request #1764 from johnjohndoe/feature/rails3-autocompletion
Add autocompletion for Rails3.
2013-06-28 12:50:04 -07:00
Robby Russell b36f53cced Merge pull request #1920 from dongweiming/update-coffee
Update coffee completion
2013-06-28 12:49:10 -07:00
Robby Russell 3072a2093e Merge pull request #1916 from okuramasafumi/master
Change duplicated alias name
2013-06-28 12:48:38 -07:00
Robby Russell db82b8e8d8 Merge pull request #1919 from dongweiming/breaking-change-bower
The current version of bower is completely unavailable, plugin depthmodification
2013-06-28 12:47:47 -07:00
Robby Russell 04c98ae92f Merge pull request #1917 from brandonblack/rvm-plugin
rvm plugin: update to ruby version helpers and rvm-update
2013-06-28 12:47:27 -07:00
Robby Russell bc3cadf5c8 Merge pull request #1913 from chriskrycho/patch-2
Add more capable hg incoming and outgoing count handling
2013-06-25 12:38:20 -07:00
Robby Russell b9baf37739 Merge pull request #1859 from ayushs/plugin-git-clean
Added alias for git clean
2013-06-25 09:26:00 -07:00
Robby Russell a8c0c4de06 Merge pull request #1864 from Stibbons/gsemet_push_git_plugin
Improvement in the git plugin
2013-06-25 09:25:38 -07:00
Robby Russell 3a3fd686ee Merge pull request #1865 from Stibbons/gsemet_push_repo_plugin
New plugin for git-repo (https://code.google.com/p/git-repo/)
2013-06-25 09:24:25 -07:00
Robby Russell e727068cee Merge pull request #1867 from telser/master
Simple Cabal plugin
2013-06-25 09:23:36 -07:00
Robby Russell 6e3e07fd90 Merge pull request #1869 from lucasuyezu/env_logs
Adding testlog and prodlog in addition to devlog.
2013-06-25 09:23:08 -07:00
Robby Russell 89b8e05009 Merge pull request #1868 from mlacorte/master
Fix for broken colors in "superjarin" theme
2013-06-25 09:22:52 -07:00
Robby Russell e8c7b77db9 Merge pull request #1880 from posva/rand-quote
Random quotes from the internet
2013-06-25 09:22:10 -07:00
Robby Russell 5bccf4b123 Merge pull request #1876 from chriskrycho/patch-1
Add count for incoming and outgoing changesets.
2013-06-25 09:21:32 -07:00
Robby Russell 7655a655f6 Merge pull request #1881 from iammichiel/patch-1
Adding a rebase option to git alias.
2013-06-25 09:21:15 -07:00
Robby Russell 11b7155469 Merge pull request #1886 from tresni/patch-5
Correctly detect JIRA Rapid Board
2013-06-25 09:14:59 -07:00
Robby Russell bf2a85c397 Merge pull request #1901 from geecu/autocomplete_required
autocomplete required packages as second argumet
2013-06-25 09:13:57 -07:00
Robby Russell 0868d71307 Merge pull request #1708 from tessi/extend_mercurial_plugin
extend mercurial plugin
2013-06-25 09:13:26 -07:00
Robby Russell 4f8d6a8b15 Merge pull request #1773 from essembeh/master
Uncomment l alias
2013-06-25 09:10:05 -07:00
Robby Russell 1e625b42ff Merge pull request #1903 from andschwa/tmux_iterm2
Tmux iTerm2 integration
2013-06-25 09:08:49 -07:00
Robby Russell 354211f5ac Merge pull request #1904 from oohlaf/gpg-agent-fix
Prevent starting multiple gpg-agents
2013-06-25 09:07:49 -07:00
Robby Russell 2b88b0d992 Merge pull request #1908 from UncleBill/patch-1
git-pull add --rebase option
2013-06-25 09:06:54 -07:00
Robby Russell 84b9598e4e Merge pull request #1909 from gonghao/master
add virtualenv prompt support for agnoster theme
2013-06-25 09:06:31 -07:00
Robby Russell c88121149a Merge pull request #1910 from dongweiming/add-celery-completion
Add celery completion
2013-06-25 09:05:30 -07:00
Robby Russell 78dba754d1 Merge pull request #1872 from gdetrez/new-powerline-range
Update the character used from powerline
2013-06-21 07:11:47 -07:00
Robby Russell c888cd15a2 Merge pull request #1873 from charlesjohnson/bundler-plugin
Update bundler.plugin.zsh
2013-06-21 07:11:25 -07:00
Robby Russell 0f2b24c1b8 Merge pull request #1887 from tgkokk/git-slow-fix
Fixed slow behavior when using GitHub wrappers
2013-06-21 07:07:26 -07:00
Robby Russell 32b4755b8a Merge pull request #1889 from jerolimov/patch-1
osx-plugin: Do not clear new tab when calling it with an argument.
2013-06-21 07:07:07 -07:00
Robby Russell 46d4606e66 Merge pull request #1756 from rkj/master
Fixed missing retcode if you tried to use themes/rkj
2013-06-17 21:23:18 -07:00
Robby Russell b88b5b2ed6 Merge pull request #1885 from eakret/termsupport-fix
Escape both % and $ in the command line
2013-06-16 11:50:59 -07:00
Robby Russell f63de87e07 Merge pull request #1894 from codewhale/master
debian plugin: ignore alias in sudo/aptitude check
2013-06-16 11:50:11 -07:00
Robby Russell 4370e2ac32 Merge pull request #1893 from jeremydt/postgres
Add new plugin for homebrew installed version of postgres
2013-06-16 11:49:18 -07:00
Robby Russell c73047e296 Merge pull request #1877 from spazm/virtualenvwrapper-cleanup
virtualenvwrapper plugin cleanup
2013-06-12 19:27:59 -07:00
Robby Russell b8af807b43 Merge pull request #1878 from spazm/virtualenv-cleanup
virtualenv cleanup: replaces subshell with prompt expansion.
2013-06-12 19:27:07 -07:00
Robby Russell 5d6a06bda6 Merge pull request #1870 from mfrobben/patch-1
Update README.textile
2013-06-06 22:45:23 -07:00
Robby Russell 86a889ea08 Merge pull request #1849 from lemieux/master
Fix for Jira plugin on Linux
2013-05-30 10:19:21 -07:00
Robby Russell 79196f8213 Merge pull request #1834 from croach/disable_untracked_files_dirty_fix
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
2013-05-23 07:58:50 -07:00
Robby Russell 0078538478 Merge pull request #1775 from marcusmueller/fixupgradetool
fix for failing substition & eliminated unnecessary cd
2013-05-23 07:52:52 -07:00
Robby Russell 78077afd12 Merge pull request #1837 from xuhdev/web-search
Add web-search plugin.
2013-05-21 15:51:07 -07:00
Robby Russell 688225a07e Merge pull request #1839 from Kronuz/patch-1
Fixed recursion. Git not needed for it to work.
2013-05-21 15:50:43 -07:00
Robby Russell 27c6becffd Merge pull request #1803 from bebugz/patch-1
gentoo linux support
2013-05-09 20:38:45 -07:00
Robby Russell b34aee7f76 Merge pull request #1774 from kevinxucs/sublime-default-2
Change sublime text path select priority on mac.
2013-04-30 23:03:24 -07:00
Robby Russell b427a41fd3 Merge pull request #1779 from lorn/fasd_update
Cache for fasd --init
2013-04-30 23:02:56 -07:00
Robby Russell b6ea876971 Merge pull request #690 from essembeh/master
Adding ~/.ssh/config parsing for host list and theme.
2013-04-23 21:27:51 -07:00
Robby Russell fd50759e39 Merge pull request #1254 from systemfreund/master
Added completion plugin for "Go" compiler
2013-04-23 21:26:43 -07:00
Robby Russell ffc6ae937c Spin to bundler 2013-04-23 21:25:03 -07:00
Robby Russell dff6333b6d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2013-04-23 21:20:14 -07:00
Robby Russell f44d403572 Resolving conflict with merge of #1058 2013-04-23 21:20:00 -07:00
Robby Russell 02f86c4a5a Merge pull request #1633 from alec-c4/master
rails4 plugin
2013-04-23 21:17:52 -07:00
Robby Russell 980aaddb03 Merge pull request #917 from agate/patch-1
added "publish" and "track" command completion for git-flow plugin
2013-04-23 21:17:34 -07:00
Robby Russell 6637c29b1e Merge pull request #1091 from jmazzi/patch-1
Improve README; Instructions for handling updates
2013-04-23 21:12:52 -07:00