Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2026-07-19 19:25:11 +02:00
Code Issues Releases Wiki Activity
1,365 Commits 5 Branches 0 Tags
13998bb2cc12d11c16728e4b1db0d2a326ca6607
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robby Russell ce20cba7e3 Merge pull request #1382 from fushunpoon/master 
Unroll for-loops in .oh-my-zsh so that running zsh-5.0.0 on Terminal.app on Snow Leopard will work.
 2012-12-02 12:58:50 -08:00
Robby Russell d19e01b140 Merge pull request #1191 from r-darwish/themes-plugin 
Themes plugin
 2012-12-02 12:50:40 -08:00
Robby Russell 275e7cba8f Merge pull request #1235 from henryyan/master 
Improved maven plugin added a lot of auto complection, add git-extras plugin
 2012-12-02 12:48:45 -08:00
Robby Russell 4cad0a48fd Merge pull request #1241 from agrimaldi/git-extras 
plugin for git-extras
 2012-12-02 12:46:30 -08:00
Robby Russell 127a47b2bd Merge pull request #1249 from korjavin/aptitude 
alias at=aptitude broke /usr/bin/at scheduler.
 2012-12-02 12:45:03 -08:00
Robby Russell aa382b572e Merge pull request #1255 from SuprDewd/master 
Added a "please" alias for sudo
 2012-12-02 12:44:17 -08:00
Robby Russell e89f950985 Merge pull request #1256 from seegno/master 
Added sf Symfony2 binary alias
 2012-12-02 12:43:59 -08:00
Robby Russell 96f35e6949 Merge pull request #1259 from bwl/sublime-fix 
Adding logic for ~/Applications folder installs of Sublime Text 2
 2012-12-02 12:43:07 -08:00
Robby Russell 9977afc0b5 Merge pull request #1263 from tedv/headless-git 
Make git use sha when branch name is missing.
 2012-12-02 12:42:38 -08:00
Robby Russell 2e5a689c05 Merge pull request #1265 from aletessier/ssh-completion 
Fix ssh plugin completion
 2012-12-02 12:42:08 -08:00
Robby Russell ac90eed387 Merge pull request #1274 from sc68cal/feature/git_decorate_log 
[Git Plugin] Add shortcut for showing log of all branches
 2012-12-02 12:39:55 -08:00
Robby Russell 215d6da3de Merge pull request #1277 from waveface/master 
git flow completion enhancement
 2012-12-02 12:39:41 -08:00
Robby Russell 44edb3ed60 Merge pull request #1278 from bitboxer/forklift 
new forklift plugin
 2012-12-02 12:39:23 -08:00
Robby Russell f28041e41f Merge pull request #1284 from obmarg/feature/debianwhichfix 
Debian plugin now pipes which stderr to stdout
 2012-12-02 12:38:56 -08:00
Robby Russell 66df0f8089 Merge pull request #1317 from thcipriani/junkfood_theme 
Added junkfood theme
 2012-12-02 12:36:32 -08:00
Robby Russell 245eee128b Merge pull request #1319 from skatkov/master 
Replace cp -verbose with rsync
 2012-12-02 12:35:20 -08:00
Robby Russell 93f41fc5fc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 12:30:51 -08:00
Robby Russell 04d08577e2 Merge pull request #1336 from aelesbao/plugin-systemd 
systemd plugin
 2012-12-02 12:27:36 -08:00
Robby Russell b2b77be56f Merge pull request #1341 from markusscherer/master 
fix title setting bug in xterm and urxvt
 2012-12-02 12:27:04 -08:00
Robby Russell e10552b403 Merge pull request #1354 from F30/master 
Set the '-R' option for less not in $PAGER, but as $LESS
 2012-12-02 12:26:41 -08:00
Robby Russell 5ed75de5ce Merge pull request #1353 from a-b/master 
Prompt symbol update
 2012-12-02 12:26:12 -08:00
Robby Russell 7004ac9ec4 Merge pull request #1371 from rdrey/master 
Fixed node-docs
 2012-12-02 12:25:02 -08:00
Robby Russell d5eddc653f Merge pull request #1376 from javageek/master 
Updated code
 2012-12-02 12:22:19 -08:00
Robby Russell 71af4d73de Merge pull request #1375 from dsx/better-pyclean 
A slightly better pyclean
 2012-12-02 12:21:26 -08:00
Robby Russell dad9352748 Merge pull request #1378 from hjhart/master 
Rapid Board url format
 2012-12-02 12:20:52 -08:00
Robby Russell 1417111bad Merge pull request #1453 from simonoff/master 
new theme and rvm theming support
 2012-12-02 12:20:31 -08:00
Robby Russell d3b867d967 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 12:16:30 -08:00
Robby Russell badc3eb6ce Merge pull request #431 from meh/rsync-plugin 
Add rsync plugin.
 2012-12-02 12:11:26 -08:00
Robby Russell 423d66da5b Merge pull request #409 from Bregor/patch-1 
Dollar sign instead of percent in unprivileged user prompt (as in real ge
 2012-12-02 12:10:32 -08:00
Robby Russell c64c30ce93 Merge pull request #214 from allancaffee/master 
Improved completion for vagrant
 2012-12-02 12:07:56 -08:00
Robby Russell 4fea3ce219 Merge pull request #1455 from NeuralSandwich/master 
Battery plugin: Added support for Apple Macs
 2012-12-02 12:07:13 -08:00
Robby Russell e477085993 Merge pull request #1456 from sputnikus/master 
Function for managing pacman-key command on Arch Linux
 2012-12-02 12:06:38 -08:00
Robby Russell 11ff3b642d Removing mcd as it conflicts with mtools 2012-12-02 12:05:58 -08:00
Robby Russell ef5a65b207 Renaming cap to capistrano 2012-12-02 12:00:52 -08:00
Robby Russell 56f094860b Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 11:50:36 -08:00
Robby Russell 80ab595696 Merge pull request #256 from lorrin/no-op_command-not-found 
Make command-not-found no-op when support not available (e.g. not on Ubuntu)
 2012-12-02 11:43:30 -08:00
Robby Russell 77e4c1c9f1 Merge pull request #253 from loopj/master 
Added function git_remote_status to lib/git.zsh which extracts if the local branch is ahead/behind/diverged from remote
 2012-12-02 11:43:09 -08:00
Robby Russell e4a596c095 Merge pull request #516 from adben/master 
New Theme
 2012-12-02 10:51:25 -08:00
Robby Russell 8796fd01cc Merge pull request #455 from aslamnd/master 
New theme
 2012-12-02 09:54:54 -08:00
Robby Russell 08cb82b9f4 Merge pull request #448 from n0nick/patch-1 
Updated the frisk theme to display Bazaar branch information as well
 2012-12-02 09:54:24 -08:00
Robby Russell 7dfd6406d8 Merge pull request #1451 from rmcastil/modify_readme_to_clarify_the_manual_way 
Modify readme to clarify the manual way
 2012-12-02 09:43:06 -08:00
Robby Russell 31ad21398e Merge pull request #1452 from miry/github 
Fix repo for github.
 2012-12-02 09:41:51 -08:00
Robby Russell 22f827e122 Merge pull request #1393 from agate/patch-2 
Update plugins/git-flow/git-flow.plugin.zsh
 2012-12-01 12:02:35 -08:00
Robby Russell 2e55825f9c Merge pull request #1365 from pcasaretto/add-heroku-remote-switch 
Add the heroku --remote switch
 2012-12-01 11:59:21 -08:00
Robby Russell b8e230205a Merge pull request #1366 from op/last-working-dir 
Added last working directory plugin
 2012-12-01 11:59:03 -08:00
Robby Russell 9a88e76823 Merge pull request #1370 from ericmathison/syntax-fix 
Fix color syntax
 2012-12-01 11:58:21 -08:00
Robby Russell f9c1a7242f Merge pull request #1347 from paulredmond/plugin/jira 
Jira Plugin - Wrong URL ⚡
 2012-12-01 11:57:21 -08:00
Robby Russell aad58afc54 Merge pull request #1386 from sanbor/master 
Pass plugin for completion
 2012-12-01 11:44:04 -08:00
Robby Russell e3b97db493 Merge pull request #1390 from pluton8/bugfix/autojump21 
Fix sourcing brew's autojump of version 21.0.3+
 2012-12-01 11:42:19 -08:00
Robby Russell 2aa485ac04 Merge pull request #1435 from Drarok/fix-svn 
Fix backwards svn "dirty" state detection
 2012-12-01 11:41:17 -08:00
Robby Russell 3657bf8efa Merge pull request #1421 from cristim/master 
Added a small mod of the tjkirch theme
 2012-12-01 11:40:44 -08:00
Robby Russell 25a2f029a4 Merge pull request #1399 from tresni/patch-1 
Update themes/minimal.zsh-theme
 2012-12-01 11:39:54 -08:00
Robby Russell 08efdcdd16 Merge pull request #1400 from tresni/patch-2 
Updated svn.plugin.zsh to behave more like lib/git.zsh
 2012-12-01 11:39:21 -08:00
Robby Russell 66e784c8c1 Merge pull request #1416 from talmuth/master 
Add support of multiple screen variants in screen plugin
 2012-12-01 11:38:52 -08:00
Robby Russell 26d46546a6 Merge pull request #1410 from jimhester/per-directory-history 
Replace reset-prompt with push-line and accept-line
 2012-12-01 11:36:22 -08:00
Robby Russell ddb8d46e98 Merge pull request #1411 from niceview/rvm 
Use rvm completion from ~/.rvm/scripts/zsh/Completion
 2012-12-01 11:35:48 -08:00
Robby Russell f2050fc093 Merge pull request #1413 from arnihermann/master 
Implement 'gup' as git pull --rebase
 2012-12-01 11:33:40 -08:00
Robby Russell 29b66b85c8 Merge pull request #1412 from jdavis/coffee_plugin 
Added a CoffeeScript plugin.
 2012-12-01 11:33:07 -08:00
Robby Russell 5189cb8843 Merge pull request #1418 from Mehonoshin/patch-2 
Added gwc(git whatchanged alias) to git plugin
 2012-12-01 11:32:35 -08:00
Robby Russell bc1a06aab4 Merge pull request #1419 from ssrihari/master 
Alias 'rdbtp' to rake db:test:prepare to rails plugin
 2012-12-01 11:32:09 -08:00
Robby Russell 293a65c9d8 Merge pull request #1439 from maxbane/master 
Revert "Fix to restore bindings after switching to vi-mode"
 2012-12-01 11:31:21 -08:00
Robby Russell 3dc1d92950 Merge pull request #1442 from willman500/git-hub-flow-plugin 
Add autocomplete for git "hubflow"
 2012-12-01 11:30:37 -08:00
Robby Russell f69b05b03a Merge pull request #1445 from knxroot/master 
urltools more fast
 2012-12-01 11:29:55 -08:00
Robby Russell ded745bf14 Modifying documentation in zshrc template for new config option 2012-11-30 05:58:08 -08:00
Robby Russell 533a281919 Merge pull request #1430 from danielsoneg/egd-update_frequency 
Add UPDATE_ZSH_DAYS setting
 2012-11-30 05:47:32 -08:00
Robby Russell 8a2314edee Merge pull request #1437 from Partyschaum/master 
Some fixes for the agnoster theme / Fixed autocompletion for autojump with homebrew
 2012-11-30 05:40:02 -08:00
Robby Russell 067178d877 Merge pull request #1446 from suzaku/patch-1 
fix typo in theme
 2012-11-30 05:37:35 -08:00
Robby Russell d750e7d9e3 Merge pull request #1426 from caarlos0/master 
fixing issue 1423
 2012-11-25 18:08:18 -08:00
Robby Russell 6fbe594238 Merge pull request #1391 from logicmd/master 
sublime text not found in Ubuntu
 2012-11-25 11:39:45 -08:00
Robby Russell 03c2712243 Merge pull request #1388 from fuadsaud/agnoster_theme_show_exit_status 
agnoster theme shows error code instead of an "x"
 2012-11-25 11:39:08 -08:00
Robby Russell aaca1c2558 Merge pull request #1395 from caarlos0/master 
added some maven love <3
 2012-11-25 11:38:54 -08:00
Robby Russell 802c2df7ba Merge pull request #1406 from chinghanho/master 
Improved statistics functions
 2012-11-25 11:37:43 -08:00
Robby Russell a5bc97f76b Merge pull request #1404 from Bklyn/master 
Fix for "?" and "!" in svn status output
 2012-11-25 11:36:46 -08:00
Robby Russell 1b4a23ac8b Merge pull request #1396 from webframp/fix/brew-autojump-zsh 
Fix for brew installed autojump
 2012-11-25 11:36:09 -08:00
Robby Russell 63cd6ef7eb Merge pull request #1415 from jmatth/git_root_pull 
Adding grt alias to the git plugin.
 2012-11-25 11:35:48 -08:00
Robby Russell fdfc0b3cd9 Merge pull request #1417 from felipec/fc-git-upstream 
Add gifast plugin
 2012-11-25 11:35:24 -08:00
Robby Russell c2ae9e09ca Merge pull request #1344 from danielcsgomes/master 
Added Composer Plugin and Symfony2 alias
 2012-10-09 06:42:27 -07:00
Robby Russell d4d2e6d659 Merge pull request #1306 from josh-/master 
New 'Nanoc' plugin
 2012-10-09 06:41:16 -07:00
Robby Russell 6d4b0c6e56 Merge pull request #1312 from koenpunt/fixes_cap_plugin 
updated cap plugin to use `cap -T` instead of `cap show_tasks`
 2012-10-09 06:40:31 -07:00
Robby Russell c5a890585b Merge pull request #1330 from trobrock/hide-rvm-prompt 
Don't show empty parens if you are using your system ruby
 2012-10-09 06:39:34 -07:00
Robby Russell 3d438617e7 Merge pull request #1333 from b4mboo/master 
Add zeus plugin
 2012-10-09 06:38:36 -07:00
Robby Russell 8a8b821aac Merge pull request #1335 from paulredmond/plugin/jira 
Open Jira issues from a project
 2012-10-09 06:37:52 -07:00
Robby Russell 9ba2ab3225 Merge pull request #1346 from ianchesal/urltools 
URL Tools Plugin
 2012-10-09 06:35:01 -07:00
Robby Russell 73f7770537 Merge pull request #1327 from agnoster/master 
BY POPULAR DEMAND... the "agnoster" theme...
 2012-09-28 22:52:19 -07:00
Robby Russell 25a9cddc21 Merge pull request #1318 from trobrock/add-puma-to-bundler 
Bundle exec puma also http://puma.io
 2012-09-23 11:48:42 -07:00
Robby Russell 8247a4097d Merge pull request #1320 from jimhester/vi-mode-patch 
Fix to restore bindings after switching to vi-mode
 2012-09-23 11:45:03 -07:00
Robby Russell 523b26c6ef Merge pull request #1321 from jimhester/per-directory-history 
Per directory history plugin
 2012-09-23 11:41:58 -07:00
Robby Russell 5f16ede7ca Merge pull request #1322 from jimhester/colemak 
Colemak plugin ( http://colemak.com/ )
 2012-09-23 11:40:14 -07:00
Robby Russell 8c2145fc85 Merge pull request #1323 from lxmonk/autojump-port 
added autojump plugin support for mac os x, when port installed autojump
 2012-09-23 11:38:46 -07:00
Robby Russell 921d2f49ef Merge pull request #1228 from clutt0n/master 
Small improving themes/jnrowe.zsh-theme
 2012-09-01 08:33:09 -07:00
Robby Russell c27183abcd Merge pull request #1287 from johnhamelink/master 
Laravel autocompletion
 2012-09-01 08:31:52 -07:00
Robby Russell a0430a0a45 Merge pull request #1279 from 3den/master 
My favourite theme with support to RVM and GIT
 2012-09-01 08:31:04 -07:00
Robby Russell 633ad0ec16 Merge pull request #1297 from everbird/master 
supervisor plugin
 2012-09-01 08:29:01 -07:00
Robby Russell d05b2010ff Merge pull request #1229 from seban/run_rails_without_bundle_exec 
'rails' command should not be run with bundle exec
 2012-07-20 15:15:05 -07:00