Commit Graph
100 Commits
Author SHA1 Message Date
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
Robby Russell 24e59aeb7e Merge pull request #1102 from drnic/git-config
More git aliases
2013-04-23 21:12:11 -07:00
Robby Russell 7ab25fba8c Merge pull request #1225 from bobmaerten/patch-1
vagrant uses 'ssh-config' command, not 'ssh_config'
2013-04-23 21:10:10 -07:00
Robby Russell 89515e3f1f Merge pull request #711 from jasongill/textmate-plugin-improvement
Improvements to the tm command in the TextMate plugin
2013-04-23 21:07:33 -07:00
Robby Russell 5078c0814d Merge pull request #424 from hackedy/fix
use /home/ryan/d/.oh-my-zsh instead of ~/.oh-my-zsh for cache
2013-04-23 21:06:28 -07:00
Robby Russell cd0908917c Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2013-04-23 20:58:47 -07:00
Robby Russell 8ce587ad9a Resolving conflict when merging in #528 2013-04-23 20:58:30 -07:00
Robby Russell 8890df1251 Merge pull request #922 from sbfaulkner/master
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
Robby Russell b035662e4c Merge pull request #1053 from cwoodcox/master
Added a neat theme called half-life. It's pretty and quite functional.
2013-04-23 20:56:18 -07:00
Robby Russell c3c355a88a Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2013-04-23 20:53:38 -07:00
Robby Russell dd6247057e Updating the README file 2013-04-23 20:52:18 -07:00
Robby Russell 27ff262e09 Merge pull request #1088 from avit/avit-theme
avit theme
2013-04-23 20:49:14 -07:00
Robby Russell b4578be3f1 Merge pull request #818 from jmacdonald/master
Alias for 'git diff'
2013-04-23 20:48:36 -07:00
Robby Russell e4891c5891 Merge pull request #1569 from ZeroKnight/master
Better custom theme loading
2013-04-23 20:47:29 -07:00
Robby Russell 81ed0c4115 Resolving conflict with merge of #970 2013-04-23 20:44:35 -07:00
Robby Russell b0f8683ffa Merge pull request #1223 from bigjust/master
Basic Virtualenv plugin
2013-04-23 20:39:27 -07:00
Robby Russell de1f803de9 Merge pull request #1620 from hreese/gpg-agent_with_sensible_ssh-agent
Disable ssh-agent support in gpg-agent-plugin if another ssh-agent is already available.
2013-04-23 20:37:48 -07:00
Robby Russell 84d9b020c2 Merge pull request #1490 from khrt/master
Added support for Subversion 1.7 for SVN plugin
2013-04-23 20:36:59 -07:00
Robby Russell 685c746cc7 Merge pull request #1565 from serdardalgic/autoenv-plugin
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv.
2013-04-23 20:33:50 -07:00
Robby Russell a2c8db9eb3 Resolving conflict in #1266 merge 2013-04-23 20:30:21 -07:00
Robby Russell 7cdb6d667c Resolving conflict when merging in 1570 2013-04-23 20:21:18 -07:00
Robby Russell d6a36b1756 Merge pull request #1575 from mguindin/agnoster-change
[agnoster-theme] modifying theme for dirty/staged files
2013-04-23 20:17:40 -07:00
Robby Russell b61555d7c0 Merge pull request #1582 from To1ne/pushdminus
use pushdminus
2013-04-23 20:16:41 -07:00
Robby Russell 8fea507b5c Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
2013-04-23 20:04:08 -07:00
Robby Russell de8bcef476 Merge pull request #1622 from hacfi/patch-1
Fix Symfony2 command completion 'permission denied'
2013-04-23 20:03:26 -07:00
Robby Russell cb8ccaf3cc Merge pull request #1634 from Anahkiasen/patch-1
Add alias for "composer dump-autoload"
2013-04-23 20:03:10 -07:00
Robby Russell 7787d1da6e Merge pull request #1641 from NeuralSandwich/master
Battery plugin updates
2013-04-23 20:01:40 -07:00
Robby Russell 1235b77eff Merge pull request #1702 from mbauhardt/copyfile
a plugin (function) which copies the content of a file into the clipboar...
2013-04-23 19:59:51 -07:00
Robby Russell 42127bee6d Merge pull request #1715 from dbohdan/master
Fixed a UTF-8 problem in the theme "fishy"
2013-04-23 19:58:59 -07:00
Robby Russell 966108a082 Merge pull request #1724 from miry/rails_aliases
Added global aliases to use RAILS_ENV.
2013-04-23 19:58:30 -07:00
Robby Russell 6daaae6347 Merge pull request #1703 from marcparadise/mp/knife-chef-11-initial-support
initial support for chef 11 integrated knife-essentials
2013-04-23 19:56:44 -07:00
Robby Russell 73edf1f1eb Merge pull request #1704 from laggyluke/st3
Support for Sublime Text 3
2013-04-23 19:56:26 -07:00
Robby Russell 1ae16a20d8 Merge pull request #1718 from toctan/master
command-not found support for Arch Linux
2013-04-23 19:55:46 -07:00
Robby Russell 2badd62c0e Merge pull request #1721 from z2v/hgplugin
Mercurial: add alias for 'hg bookmarks'
2013-04-23 19:55:30 -07:00
Robby Russell 108fe7c933 Merge pull request #1707 from bkg/django-static
Add django plugin command
2013-04-23 19:53:50 -07:00
Robby Russell b01a48d056 Merge pull request #1714 from f0y/07738ea86330b7b77127fc6f18474b3da2c6ecec
Colorize plugin
2013-04-23 19:53:33 -07:00
Robby Russell 51d7d57331 Merge pull request #1719 from MatthR3D/master
Improved the archlinux plugin
2013-04-23 19:50:21 -07:00
Robby Russell 2a2cc81ea5 Merge pull request #1726 from rkj/master
Slightly changed my themes to include return code of last invoked command.
2013-04-23 19:49:12 -07:00
Robby Russell d8b6acd0af Merge pull request #1728 from szines/patch-1
Update rvm.plugin.zsh to the latest ruby versions
2013-04-23 19:48:55 -07:00
Robby Russell b5ead7be01 Merge pull request #1729 from statschner/master
Added git-flow-avh plugin
2013-04-23 19:48:15 -07:00
Robby Russell 91cb7955cb Merge pull request #1739 from felipec/fc/gitfast
Updates to gifast
2013-04-23 19:46:54 -07:00
Robby Russell e953fcf516 Merge pull request #1749 from johnjohndoe/feature/zeus-auto-completion
Add auto-completion for zeus.
2013-04-23 19:46:09 -07:00
Robby Russell 81ed18f722 Merge pull request #1733 from jaseg/patch-1
The safe-paste plugin now works with tmux, too
2013-04-23 19:45:29 -07:00
Robby Russell 78bb69968d Merge pull request #1734 from cborgia/master
simple grammar change in template file
2013-04-23 19:45:15 -07:00
Robby Russell bba45753ca Merge pull request #1737 from hron84/feature-bundler-add-cleanup
Adding undocumented clean command to completion
2013-04-23 19:44:28 -07:00
Robby Russell 56b4d4d639 Merge pull request #1738 from ronshapiro/master
Battery plugin changes
2013-04-23 19:44:11 -07:00
Robby Russell d8d9da025b Merge pull request #1748 from tobiassjosten/patch-1
Added 'jekyll' to list of bundled commands
2013-04-23 19:43:26 -07:00