Commit Graph

  • 868a5138f6 Resolving conflict in merge of #1313 Robby Russell 2012-12-04 06:35:59 -08:00
  • 3199d2ed8d Merge pull request #1387 from jimhester/vi-mode-patch Robby Russell 2012-12-04 06:34:02 -08:00
  • 43ca5d8cbe Merge pull request #1458 from ranman/master Robby Russell 2012-12-04 06:33:41 -08:00
  • 9ae128983a Merge pull request #1454 from gAmUssA/patch-4 Robby Russell 2012-12-04 06:33:13 -08:00
  • b204ce8f67 Merge pull request #1462 from aliasbind/master Robby Russell 2012-12-03 07:26:25 -08:00
  • 26b3e1015d Merge pull request #1460 from tresni/patch-4 Robby Russell 2012-12-03 07:25:51 -08:00
  • 2f0717cb76 Merge pull request #1459 from tresni/patch-3 Robby Russell 2012-12-03 07:25:35 -08:00
  • 1ad2104d7a Merge pull request #1463 from syphar/fix_last_working_dir Robby Russell 2012-12-03 07:25:08 -08:00
  • 8925cff334 Fix prompt color: Change it back to green Andrei Gorgan 2012-12-03 12:29:45 +02:00
  • 98bd19a036 plugin last-working-dir: create cache-directory if it doesn't exist Denis Cornehl 2012-12-03 11:06:31 +01:00
  • e096e4041f Print last exit status in mortalscumbag prompt Andrei Gorgan 2012-12-03 12:03:43 +02:00
  • 80f151e56d urltools for Everyone Brian Hartvigsen 2012-12-02 23:06:11 -07:00
  • 39e5c9a6d7 Backwards Compatible Jira URLs #1378 Brian Hartvigsen 2012-12-02 22:59:05 -07:00
  • b9d5a39098 use lazy load for virtualenvwrapper J. Randall Hunt 2012-12-02 16:32:29 -05:00
  • 51e05b7579 hg_current_branch added to mercurial plugin Lucas Sampaio 2012-10-05 17:27:05 -03:00
  • 5193a1dbc9 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh Robby Russell 2012-12-02 13:11:02 -08:00
  • f8343b0fd9 Merge pull request #1457 from NeuralSandwich/master Robby Russell 2012-12-02 13:08:30 -08:00
  • 13998bb2cc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh Robby Russell 2012-12-02 13:08:12 -08:00
  • dfbafe6d58 Fixing conflict in install scripts Probably Not 2012-08-04 11:41:47 -07:00
  • fcc8b19253 Merge pull request #1328 from mfoo/master Robby Russell 2012-12-02 13:05:28 -08:00
  • 228c3fc89f Merge pull request #1301 from bencao/master Robby Russell 2012-12-02 13:04:14 -08:00
  • ef4e2aa26d Merge pull request #1293 from cenkalti/master Robby Russell 2012-12-02 13:03:28 -08:00
  • fdf3a3998f Merge pull request #1295 from XL64/master Robby Russell 2012-12-02 13:02:38 -08:00
  • 1f284071de Merge pull request #1298 from nickhutchinson/fishy Robby Russell 2012-12-02 13:02:22 -08:00
  • ce20cba7e3 Merge pull request #1382 from fushunpoon/master Robby Russell 2012-12-02 12:58:50 -08:00
  • d19e01b140 Merge pull request #1191 from r-darwish/themes-plugin Robby Russell 2012-12-02 12:50:40 -08:00
  • 275e7cba8f Merge pull request #1235 from henryyan/master Robby Russell 2012-12-02 12:48:45 -08:00
  • 4cad0a48fd Merge pull request #1241 from agrimaldi/git-extras Robby Russell 2012-12-02 12:46:30 -08:00
  • 127a47b2bd Merge pull request #1249 from korjavin/aptitude Robby Russell 2012-12-02 12:45:03 -08:00
  • aa382b572e Merge pull request #1255 from SuprDewd/master Robby Russell 2012-12-02 12:44:17 -08:00
  • e89f950985 Merge pull request #1256 from seegno/master Robby Russell 2012-12-02 12:43:59 -08:00
  • 96f35e6949 Merge pull request #1259 from bwl/sublime-fix Robby Russell 2012-12-02 12:43:07 -08:00
  • 9977afc0b5 Merge pull request #1263 from tedv/headless-git Robby Russell 2012-12-02 12:42:38 -08:00
  • 2e5a689c05 Merge pull request #1265 from aletessier/ssh-completion Robby Russell 2012-12-02 12:42:08 -08:00
  • ac90eed387 Merge pull request #1274 from sc68cal/feature/git_decorate_log Robby Russell 2012-12-02 12:39:55 -08:00
  • 215d6da3de Merge pull request #1277 from waveface/master Robby Russell 2012-12-02 12:39:41 -08:00
  • 44edb3ed60 Merge pull request #1278 from bitboxer/forklift Robby Russell 2012-12-02 12:39:23 -08:00
  • 5991bf3ac1 Fixed Kernel Detection in battery plugin Sean Jones 2012-12-02 20:39:01 +00:00
  • f28041e41f Merge pull request #1284 from obmarg/feature/debianwhichfix Robby Russell 2012-12-02 12:38:56 -08:00
  • 66df0f8089 Merge pull request #1317 from thcipriani/junkfood_theme Robby Russell 2012-12-02 12:36:32 -08:00
  • 245eee128b Merge pull request #1319 from skatkov/master Robby Russell 2012-12-02 12:35:20 -08:00
  • 93f41fc5fc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh Robby Russell 2012-12-02 12:30:51 -08:00
  • fe094712fb resolving conflict in termsupport plugin Trae Robrock 2011-12-20 18:15:19 -08:00
  • 04d08577e2 Merge pull request #1336 from aelesbao/plugin-systemd Robby Russell 2012-12-02 12:27:36 -08:00
  • b2b77be56f Merge pull request #1341 from markusscherer/master Robby Russell 2012-12-02 12:27:04 -08:00
  • e10552b403 Merge pull request #1354 from F30/master Robby Russell 2012-12-02 12:26:41 -08:00
  • 5ed75de5ce Merge pull request #1353 from a-b/master Robby Russell 2012-12-02 12:26:12 -08:00
  • 7004ac9ec4 Merge pull request #1371 from rdrey/master Robby Russell 2012-12-02 12:25:02 -08:00
  • d5eddc653f Merge pull request #1376 from javageek/master Robby Russell 2012-12-02 12:22:19 -08:00
  • 71af4d73de Merge pull request #1375 from dsx/better-pyclean Robby Russell 2012-12-02 12:21:26 -08:00
  • dad9352748 Merge pull request #1378 from hjhart/master Robby Russell 2012-12-02 12:20:52 -08:00
  • 1417111bad Merge pull request #1453 from simonoff/master Robby Russell 2012-12-02 12:20:31 -08:00
  • d3b867d967 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh Robby Russell 2012-12-02 12:16:30 -08:00
  • ab13d0756f git find Marcus Müller 2012-09-28 17:19:28 +02:00
  • badc3eb6ce Merge pull request #431 from meh/rsync-plugin Robby Russell 2012-12-02 12:11:26 -08:00
  • 423d66da5b Merge pull request #409 from Bregor/patch-1 Robby Russell 2012-12-02 12:10:32 -08:00
  • c64c30ce93 Merge pull request #214 from allancaffee/master Robby Russell 2012-12-02 12:07:56 -08:00
  • 4fea3ce219 Merge pull request #1455 from NeuralSandwich/master Robby Russell 2012-12-02 12:07:13 -08:00
  • e477085993 Merge pull request #1456 from sputnikus/master Robby Russell 2012-12-02 12:06:38 -08:00
  • 11ff3b642d Removing mcd as it conflicts with mtools Robby Russell 2012-12-02 12:05:58 -08:00
  • ef5a65b207 Renaming cap to capistrano Robby Russell 2012-12-02 12:00:52 -08:00
  • 8fe6ea3889 Functions for managing pacman-key Martin Putniorz 2012-12-02 20:55:19 +01:00
  • 56f094860b Merge branch 'master' of github.com:robbyrussell/oh-my-zsh Robby Russell 2012-12-02 11:50:36 -08:00
  • 5f62d2c183 Added Candy-Kingdom theme Sean Jones 2012-12-02 19:46:53 +00:00
  • 80ab595696 Merge pull request #256 from lorrin/no-op_command-not-found Robby Russell 2012-12-02 11:43:30 -08:00
  • 77e4c1c9f1 Merge pull request #253 from loopj/master Robby Russell 2012-12-02 11:43:09 -08:00
  • e226fc048a Added support for Mac to battery plugin Sean Jones 2012-12-02 19:36:33 +00:00
  • 54f1990511 Update plugins/sublime/sublime.plugin.zsh Viktor Gamov 2012-12-02 13:54:24 -05:00
  • e4a596c095 Merge pull request #516 from adben/master Robby Russell 2012-12-02 10:51:25 -08:00
  • 27841ca7c1 Set default for rvm prompt prefix/suffix Alexander Simonov 2012-12-02 20:30:25 +02:00
  • 30687c4147 Fix RVM loading and RVM ruby version info Alexander Simonov 2011-05-22 01:31:11 +02:00
  • f9de64460c Simonoff theme Alexander Simonov 2011-05-22 01:29:41 +02:00
  • 8796fd01cc Merge pull request #455 from aslamnd/master Robby Russell 2012-12-02 09:54:54 -08:00
  • 08cb82b9f4 Merge pull request #448 from n0nick/patch-1 Robby Russell 2012-12-02 09:54:24 -08:00
  • 7dfd6406d8 Merge pull request #1451 from rmcastil/modify_readme_to_clarify_the_manual_way Robby Russell 2012-12-02 09:43:06 -08:00
  • 31ad21398e Merge pull request #1452 from miry/github Robby Russell 2012-12-02 09:41:51 -08:00
  • f29daef297 Fix repo for github. Michael Nikitochkin 2012-12-02 14:16:58 +02:00
  • 60c3813472 Make the NOTE an optional for improved instructions Ryan Castillo 2012-12-01 21:10:23 -05:00
  • 5b201468d1 Improve formatting of step 2 for clarity Ryan Castillo 2012-12-01 21:03:07 -05:00
  • 22f827e122 Merge pull request #1393 from agate/patch-2 Robby Russell 2012-12-01 12:02:35 -08:00
  • 2e55825f9c Merge pull request #1365 from pcasaretto/add-heroku-remote-switch Robby Russell 2012-12-01 11:59:21 -08:00
  • b8e230205a Merge pull request #1366 from op/last-working-dir Robby Russell 2012-12-01 11:59:03 -08:00
  • 9a88e76823 Merge pull request #1370 from ericmathison/syntax-fix Robby Russell 2012-12-01 11:58:21 -08:00
  • f9c1a7242f Merge pull request #1347 from paulredmond/plugin/jira Robby Russell 2012-12-01 11:57:21 -08:00
  • aad58afc54 Merge pull request #1386 from sanbor/master Robby Russell 2012-12-01 11:44:04 -08:00
  • e3b97db493 Merge pull request #1390 from pluton8/bugfix/autojump21 Robby Russell 2012-12-01 11:42:19 -08:00
  • 2aa485ac04 Merge pull request #1435 from Drarok/fix-svn Robby Russell 2012-12-01 11:41:17 -08:00
  • 3657bf8efa Merge pull request #1421 from cristim/master Robby Russell 2012-12-01 11:40:44 -08:00
  • 25a2f029a4 Merge pull request #1399 from tresni/patch-1 Robby Russell 2012-12-01 11:39:54 -08:00
  • 08efdcdd16 Merge pull request #1400 from tresni/patch-2 Robby Russell 2012-12-01 11:39:21 -08:00
  • 66e784c8c1 Merge pull request #1416 from talmuth/master Robby Russell 2012-12-01 11:38:52 -08:00
  • 26d46546a6 Merge pull request #1410 from jimhester/per-directory-history Robby Russell 2012-12-01 11:36:22 -08:00
  • ddb8d46e98 Merge pull request #1411 from niceview/rvm Robby Russell 2012-12-01 11:35:48 -08:00
  • f2050fc093 Merge pull request #1413 from arnihermann/master Robby Russell 2012-12-01 11:33:40 -08:00
  • 29b66b85c8 Merge pull request #1412 from jdavis/coffee_plugin Robby Russell 2012-12-01 11:33:07 -08:00
  • 5189cb8843 Merge pull request #1418 from Mehonoshin/patch-2 Robby Russell 2012-12-01 11:32:35 -08:00
  • bc1a06aab4 Merge pull request #1419 from ssrihari/master Robby Russell 2012-12-01 11:32:09 -08:00
  • 293a65c9d8 Merge pull request #1439 from maxbane/master Robby Russell 2012-12-01 11:31:21 -08:00
  • 3dc1d92950 Merge pull request #1442 from willman500/git-hub-flow-plugin Robby Russell 2012-12-01 11:30:37 -08:00
  • f69b05b03a Merge pull request #1445 from knxroot/master Robby Russell 2012-12-01 11:29:55 -08:00