Commit graph

  • 82723366d2 Merge f35bfd9c4b into b8ade4815a GitHub Merge Button 2011-10-10 05:49:18 -07:00
  • b8ade4815a Merge pull request #529 from dbb/master Robby Russell 2011-10-10 05:48:49 -07:00
  • 70cc496e80 Merge d3116d4f0b into 03fc819bee GitHub Merge Button 2011-10-10 05:46:44 -07:00
  • 03fc819bee Merge pull request #552 from Tricon/master Robby Russell 2011-10-10 05:46:08 -07:00
  • c3c2b1f455 Merge ecfac1cd74 into 833c856b84 GitHub Merge Button 2011-10-10 05:45:58 -07:00
  • 833c856b84 Merge pull request #579 from hakanensari/bundler-plugin-patch Robby Russell 2011-10-10 05:45:19 -07:00
  • d453e671c7 Merge ee507c9046 into dfc7319491 GitHub Merge Button 2011-10-10 05:45:13 -07:00
  • feb9ccbe3c Merge 0061dda057 into dfc7319491 GitHub Merge Button 2011-10-10 05:45:00 -07:00
  • dfc7319491 Merge pull request #594 from sirech/fix-bundle-compl Robby Russell 2011-10-10 05:44:26 -07:00
  • 09aad49bb3 Merge 965e1cfefa into cceb387e0b GitHub Merge Button 2011-10-10 05:43:39 -07:00
  • cceb387e0b Merge pull request #595 from zachriggle/grails-plugin Robby Russell 2011-10-10 05:42:56 -07:00
  • dd55a163f9 Merge f9c143b69c into 0fe2462af8 GitHub Merge Button 2011-10-10 05:41:23 -07:00
  • 0fe2462af8 Merge pull request #554 from toolbear/549-fix-auto-upgrade Robby Russell 2011-10-10 05:40:38 -07:00
  • b795b786b7 Merge dd29f4b4a2 into 167f84dacd GitHub Merge Button 2011-10-10 05:40:23 -07:00
  • 3d3d655282 Merge 579613bf6c into 167f84dacd GitHub Merge Button 2011-10-10 05:40:20 -07:00
  • f5b8e5ecf2 Merge c113e88c45 into 167f84dacd GitHub Merge Button 2011-10-10 05:40:09 -07:00
  • 167f84dacd Merge pull request #607 from vddgil/patch-1 Robby Russell 2011-10-10 05:40:01 -07:00
  • fc65612250 Merge 701f775c18 into c5e6dbf76b GitHub Merge Button 2011-10-10 05:39:55 -07:00
  • c5e6dbf76b Merge pull request #613 from rkj/master Robby Russell 2011-10-10 05:39:35 -07:00
  • 50e9b92c65 Merge d22b253ce2 into 15d7a4c225 GitHub Merge Button 2011-10-10 05:39:30 -07:00
  • 15d7a4c225 Merge pull request #614 from philippbosch/feature/terminitor-plugin Robby Russell 2011-10-10 05:38:57 -07:00
  • 2075201a06 Merge 3813fc88d0 into 85fd141ff9 GitHub Merge Button 2011-10-10 05:37:29 -07:00
  • 8405e9e253 Merge 9cb4c0962d into 85fd141ff9 GitHub Merge Button 2011-10-10 05:37:28 -07:00
  • fcd41883b8 Merge 0d285e3a0f into 85fd141ff9 GitHub Merge Button 2011-10-10 05:37:27 -07:00
  • 85fd141ff9 Merge pull request #622 from foozmeat/master Robby Russell 2011-10-10 05:36:39 -07:00
  • c871d062c2 Merge b2703a3c8a into ebd0523a4a GitHub Merge Button 2011-10-10 05:36:33 -07:00
  • ebd0523a4a Merge pull request #626 from nickstenning/upstream Robby Russell 2011-10-10 05:36:23 -07:00
  • 299ebb2e77 Merge 8287cc177e into 72adfb6cc7 GitHub Merge Button 2011-10-10 05:36:00 -07:00
  • d15605d44b Merge 62aae4f1ac into 72adfb6cc7 GitHub Merge Button 2011-10-10 05:35:50 -07:00
  • 72adfb6cc7 Merge pull request #631 from danshearmur/git-merge-alias Robby Russell 2011-10-10 05:35:16 -07:00
  • c4530b5bfd Merge c1c7b0e4af into 57f04b921e GitHub Merge Button 2011-10-10 05:34:35 -07:00
  • 57f04b921e Merge pull request #645 from mr-szymanski/master Robby Russell 2011-10-10 05:33:55 -07:00
  • 37c2037ee1 Merge c373c7153b into 1228638b41 GitHub Merge Button 2011-10-10 05:33:49 -07:00
  • 1228638b41 Merge pull request #648 from SFEley/d926a55872b5a12ab8b987e9d86c02358d0c825e Robby Russell 2011-10-10 05:33:12 -07:00
  • 35e62ba79c Merge d926a55872 into 26b20e21e1 GitHub Merge Button 2011-10-10 05:33:00 -07:00
  • 26b20e21e1 Merge pull request #418 from ptrv/master Robby Russell 2011-10-10 05:31:54 -07:00
  • 37b7ccdb34 Merge 55eda0c48b into 11a0c33323 GitHub Merge Button 2011-10-10 05:31:14 -07:00
  • 11a0c33323 Merge pull request #441 from Gonzih/master Robby Russell 2011-10-10 05:30:55 -07:00
  • f32ef546ea Merge 8a31ae5137 into cc82ac1ed6 GitHub Merge Button 2011-10-10 05:27:47 -07:00
  • cc82ac1ed6 Merge pull request #273 from blueyed/hub-alias-only-with-ruby Robby Russell 2011-10-10 05:27:33 -07:00
  • 53f72c6a6c Merge 911837c48f into 490177d48b GitHub Merge Button 2011-10-10 05:26:34 -07:00
  • 490177d48b Merge pull request #225 from Soliah/plugin-bundler Robby Russell 2011-10-10 05:26:28 -07:00
  • 76ad8874ad Merge 4144f4beea into 7b6b6f1d92 GitHub Merge Button 2011-10-10 05:24:44 -07:00
  • 7b6b6f1d92 Merge pull request #205 from sorin-ionescu/plugin-gnu-utils Robby Russell 2011-10-10 05:24:38 -07:00
  • f18bd0da1c Merge bf86502b69 into 84c20ce6dd GitHub Merge Button 2011-10-10 05:17:34 -07:00
  • 84c20ce6dd Merge pull request #482 from volpino/master Robby Russell 2011-10-10 05:17:21 -07:00
  • ebbd37d089 Merge cbf662744f into e91e384497 GitHub Merge Button 2011-10-10 05:13:01 -07:00
  • e91e384497 Merge pull request #428 from matthewmccullough/gradleplugin Robby Russell 2011-10-10 05:12:43 -07:00
  • 54f4c15755 Merge c2a95b796b into e59a9cbbaa GitHub Merge Button 2011-10-10 05:10:46 -07:00
  • e59a9cbbaa Merge pull request #338 from norm2782/master Robby Russell 2011-10-10 05:10:27 -07:00
  • 4d79bf7db2 Merge 8454542ddc into 6cc4389304 GitHub Merge Button 2011-10-10 05:10:19 -07:00
  • 6cc4389304 Merge pull request #319 from sorin-ionescu/plugin-npm Robby Russell 2011-10-10 05:10:03 -07:00
  • e9ab128928 Merge 5aa6b0fae5 into 1ab0054dc6 GitHub Merge Button 2011-10-10 05:08:46 -07:00
  • 1ab0054dc6 Merge pull request #275 from tristan0x/require_tool Robby Russell 2011-10-10 05:08:38 -07:00
  • 425a94e63d Merge 0c032aaf81 into 6e8c0c178d GitHub Merge Button 2011-10-10 05:07:43 -07:00
  • 6e8c0c178d Merge pull request #274 from diofeher/master Robby Russell 2011-10-10 05:07:35 -07:00
  • 785be8d705 Merge b2d5b43650 into 14bb3105d3 GitHub Merge Button 2011-10-10 04:58:07 -07:00
  • 4f0257b7d9 Merge ca1fccab47 into 14bb3105d3 GitHub Merge Button 2011-10-10 04:58:06 -07:00
  • ac681b6ddc Merge deb452e823 into 14bb3105d3 GitHub Merge Button 2011-10-10 04:57:59 -07:00
  • 14bb3105d3 Merge pull request #525 from kibs/master Robby Russell 2011-10-10 04:57:57 -07:00
  • f63c74039e Merge 3780247f63 into 762b55bb2b GitHub Merge Button 2011-10-10 04:52:27 -07:00
  • 646a2fe783 add global alias for grep and less command Anatoliy Kovalchuk 2011-10-10 00:11:42 +03:00
  • fada2f3703 add global Rails env aliases Anatoliy Kovalchuk 2011-10-10 00:09:24 +03:00
  • 59e2f43237 Added battery charge gauge from: http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/ to themes Battery gauge requires a python script, 'battcharge.py' added to $ZSH/lib/ directory to work properly. Cleaned up zshmarks again, now uses proper return codes in case bookmark not found, etc. Jocelyn Mallon 2011-10-08 13:06:09 -07:00
  • 2dc12882af Just still tweaking my new themes/prompts, cleaning up color consistency, etc. Jocelyn Mallon 2011-10-07 13:54:56 -07:00
  • 0c4ec31399 Fixed Darwin test Mark Robert Henderson 2011-10-07 01:54:06 -05:00
  • caf35710b5 Fixed all variations of new prompt theme to obey re-enable oh-my-zsh auto-title support. Themes will obey the global DISABLE_AUTO_TITLE="true" setting in .zshrc file now too Jocelyn Mallon 2011-10-06 19:12:43 -07:00
  • 3c5fb0ad88 update aliases Robin Wenglewski 2011-10-06 22:42:02 +02:00
  • 4fbd0436b4 added ruby v to roymuse roy osherove 2011-10-06 12:23:21 +02:00
  • ce4afcfa04 Disabling auto-update Gernot Poetsch 2011-10-06 11:31:13 +02:00
  • ea1cf305fe added a couple new color variations on my new prompt theme. also switched to proper 'unset' syntax in zshmarks, instead of destroying variable by setting to null string Jocelyn Mallon 2011-10-05 23:07:06 -07:00
  • 279af3301c Still tweaking new theme, added a really hack-ish method of colorizing command/input text, had to remove right prompt for this to work, and also moved exit codes >0 to the left of git prompt info. Jocelyn Mallon 2011-10-05 17:55:35 -07:00
  • fdc2acba61 added faster git time status to roymuse roy osherove 2011-10-06 01:35:16 +02:00
  • b39fa51746 quick update to new theme to 'bold' the git status symbols Jocelyn Mallon 2011-10-05 16:33:34 -07:00
  • cd8af85db3 Added another custom theme, based on theme information from: http://aperiodic.net/phil/prompt/ Jocelyn Mallon 2011-10-05 16:33:01 -07:00
  • a792efcaa3 added roymuse roy osherove 2011-10-06 00:40:25 +02:00
  • de29ef809d Change default zshrc to export $ZSH (as required by check_for_upgrade.sh). Jason Whittle 2011-10-05 00:57:48 -03:00
  • 858da593a9 revert green color for stdin in prompt Jocelyn Mallon 2011-10-04 20:35:56 -07:00
  • 06a077e570 slight tweaks to prompt/theme, and modified alias file to add a few new directory (ls) command options Jocelyn Mallon 2011-10-04 19:52:05 -07:00
  • c373c7153b Fix up some wonkiness Mark Szymanski 2011-10-04 21:30:32 -05:00
  • 40cc4dabfb Add new theme: wuffers Mark Szymanski 2011-10-04 21:27:36 -05:00
  • c103b091d4 name change to 'zshmarks' to better represent that this comes from 'bash marks' Jocelyn Mallon 2011-10-03 19:25:26 -07:00
  • 820a027d47 bash marks port to zsh, with completion and my own personal theme Jocelyn Mallon 2011-10-03 16:48:28 -07:00
  • 6fa87e77fe Merge remote-tracking branch 'upstream/master' Juan Hernández Babón 2011-10-03 21:46:44 +02:00
  • 8ead5d8d53 add: battery plugin Peter Hoeg 2011-10-03 13:47:25 +08:00
  • e42f1f9b74 add: rbenv plugin Peter Hoeg 2011-10-03 13:47:16 +08:00
  • 2fc154993c Run softwareupdate along with oh-my-zsh update Mark Robert Henderson 2011-10-01 20:25:30 -05:00
  • b20eae8f3a Henburn theme Mark Robert Henderson 2011-10-01 20:25:04 -05:00
  • 998ac796e6 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh Brian Guthrie 2011-09-30 12:55:03 -05:00
  • 2bdcd34e08 Removed vi-mode. Brian Guthrie 2011-09-30 11:34:04 -05:00
  • deb8543bb4 Show if you're ahead of remote in the wedisagree theme Marco A. Peraza 2011-09-29 14:39:09 -04:00
  • 2aab2de99a use textmate as default editor, set IDEA_JDK Robin Wenglewski 2011-09-29 17:03:01 +02:00
  • 3cdaf4af9f Merge branch 'master' of github.com:peterhoeg/oh-my-zsh Peter Hoeg 2011-09-29 22:42:41 +08:00
  • 4824160840 fix variables vs functions Peter Hoeg 2011-09-29 22:42:21 +08:00
  • 82840ba66d Merge branch 'master' of git://github.com/peterhoeg/oh-my-zsh Peter Hoeg 2011-09-29 22:38:28 +08:00
  • 485439dddb change: make battery indicator change color based on status Peter Hoeg 2011-09-29 22:38:10 +08:00
  • 4302f4dcec Added "itabhere" for wierdy iTab users... D. Rimron 2011-09-29 15:02:12 +01:00
  • 50de267714 Add mgdm theme Michael Maclean 2011-09-29 14:43:50 +01:00
  • 4d42128de2 Edited plugins/vi-mode/vi-mode.plugin.zsh via GitHub purem 2011-09-29 13:18:52 +02:00
  • 38318786c2 Add alias for listing files in modification order, latest at bottom Miki Leskinen 2011-09-29 13:27:42 +03:00