Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-29 16:11:01 +02:00
Code Issues Releases Wiki Activity
1,773 Commits 4 Branches 0 Tags
86a889ea083d341ba2bc48656008e5af46a3df2d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robby Russell 30b0eb3ffa Merge pull request #1740 from felipec/fc/git 
git: fix parse_git_dirty()
 2013-04-23 19:42:58 -07:00
Robby Russell adb86fa83d Merge pull request #1750 from JamesFerguson/master 
Make git_remote_branch plugin git-flow friendly
 2013-04-23 19:42:33 -07:00
Robby Russell 93ee939383 Merge pull request #1745 from jtheoof/master 
Added option to allow untracked files as non dirty
 2013-04-22 19:08:55 -07:00
Robby Russell 5f32c8e155 Merge pull request #1747 from dhemmerling/mvn_tomcat-redeploy 
mvn plugin was missing "redeploy" completion for tomcat.
 2013-04-22 19:07:07 -07:00
Robby Russell 85426a57a2 Merge pull request #1526 from filipechagas/master 
Gitfast plugin - Untracked files char not shown %
 2013-04-12 06:17:19 -07:00
Robby Russell 085af13b47 Merge pull request #1531 from lcosmin/master 
Fixed 'ls' issue on NetBSD
 2013-04-12 06:16:54 -07:00
Robby Russell d4fb254d28 Merge pull request #1532 from ryanneufeld/torrent_tools 
Adding torrent tools plugin.
 2013-04-12 06:16:39 -07:00
Robby Russell 631da358a5 Merge pull request #1537 from everbird/master 
fabric plugin
 2013-04-12 06:16:25 -07:00
Robby Russell 4d01d795b3 Merge pull request #1540 from goofansu/add-rebar-plugin 
Add rebar plugin
 2013-04-12 06:16:06 -07:00
Robby Russell d8e700c1b6 Merge pull request #1651 from deepusudhakar/master 
Escape $ZSH path in upgrade_oh_my_zsh
 2013-04-12 05:56:50 -07:00
Robby Russell f2a927f9b2 Merge pull request #1696 from henryyan/master 
Added $PATH to PATH in install shell
 2013-04-12 05:56:24 -07:00
Robby Russell 41180bfe10 Merge pull request #1700 from Bercio/master 
Was broken, >! doesn't work with noclobbing. Fixed it.
 2013-04-12 05:55:56 -07:00
Robby Russell 6a5afc1ff7 Merge pull request #1701 from mbauhardt/copydir 
a plugin (function) which copies the current directory into the clipboar...
 2013-04-11 14:57:34 -07:00
Robby Russell 459e7fffc4 Merge pull request #1706 from keyvez/master 
Fixes Issue#1705
 2013-04-11 14:57:06 -07:00
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