Commit graph

73 commits

Author SHA1 Message Date
Gaetan Semet
cf1c065d71 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2014-10-07 11:53:12 +02:00
Adam Poskitt
acbbf7659b Update README.textile 2014-09-18 15:55:40 +02:00
Adam Poskitt
8791b00472 Update README.textile 2014-09-17 14:15:17 +02:00
Carlos Cardoso
c95561b79f merged upstream in 2014-09-03 01:15:27 -03:00
Gaetan Semet
ab4149fe7c Merge remote-tracking branch 'upstream/master' 2014-08-11 11:11:24 +02:00
Adam Poskitt
397a9f7b7b Update README.textile 2014-08-02 11:43:32 +01:00
Abhas Mittal
fbdacbfb1a Update README.textile 2014-07-31 18:32:57 +05:30
Abhas Mittal
0174feef0d Update README.textile
Added instructions for installing zsh (due to the problems with first time zsh users)
2014-07-31 18:24:01 +05:30
Gaetan Semet
ec49ae1a98 Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/git.zsh
	plugins/common-aliases/common-aliases.plugin.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
2014-07-03 16:18:02 +02:00
Tony
0b4bf905f5 Minor markup edits 2014-05-24 08:34:22 +02:00
Gaetan Semet
5afa441d66 Merge remote-tracking branch 'upstream/master'
Conflicts:
	templates/zshrc.zsh-template
2014-03-24 11:54:41 +01:00
Carlos Cardoso
ad4e88bc23 Merged blessed. 2014-03-23 19:58:16 -03:00
Robby Russell
fff49ae523 Merge pull request #990 from tommorris/master
README should have link to wiki for plugins
2014-03-22 15:38:47 -07:00
Gaetan Semet
4888217c85 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
2014-03-14 16:50:51 +01:00
Robby Russell
9cb14dc886 Merge pull request #1085 from avit/install-path
Accept alternate install paths via ZSH variable
2014-03-13 07:35:01 -07:00
Robby Russell
b6cbba9dfe Updating README to show the new install URL, which redirects to the raw files on github. 2014-03-12 07:52:20 -07:00
Andrew Vit
9f66d5b797 Document alternate install paths via ZSH variable
Uses environment variable $ZSH to configure install location.
2014-03-08 13:50:12 -08:00
Gaetan Semet
0d7703f101 updated git remotes
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-24 15:07:52 +01:00
Gaetan Semet
21b5890ee6 updated readme
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-02-10 11:51:54 +01:00
Gaetan Semet
24f2838f0b Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
2013-12-03 09:41:48 +01:00
Carlos Cardoso
7062f131f0 merge upstream 2013-11-12 22:43:28 -02:00
Puneet Goyal
1dddec6f0f removing a github redirect during install 2013-10-12 07:30:16 +05:30
Robby Russell
dff966afad Logo draft 1... 2013-09-06 16:00:24 -07:00
Gaetan Semet
f69fd70b81 update README 2013-07-17 10:06:24 +02:00
Stibbons
c1e1dd220f Update README.textile 2013-07-15 15:22:07 +02:00
Stibbons
be5b17f613 Update README.textile 2013-07-15 15:21:46 +02:00
Stibbons
c9d10bc52a Update my git workflow 2013-07-15 15:21:16 +02:00
Carlos Cardoso
b5205c12d4 Merge remote-tracking branch 'upstream/master'
* upstream/master: (41 commits)
  fixed typo in tmux plugin
  Update coffee completion
  The current version of bower is completely unavailable, plugin depth modification
  rvm plugin: update to ruby version helpers and rvm-update
  Change duplicated alias name
  Add autocompletion for Rails3.
  Add more capable hg incoming and outgoing count handling
  Add celery completion
  add virtualenv prompt support for agnoster theme
  git-pull add --rebase option
  Typo
  Prevent starting multiple gpg-agents
  Not loading home tmux confs when iTerm2 tmux integration is enabled
  Adding support for iTerm2 tmux integration via option '-CC'
  remove unused function
  autocomplete required packages as second argumet
  debian plugin: ignore alias in sudo/aptitude check
  Add new plugin for homebrew installed version of postgres
  Do not clear tab when calling it with an argument.
  Correctly detect Rapid Board
  ...
2013-07-12 14:26:59 -03:00
Gaetan Semet
8c1d358741 updated README
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 12:16:39 +02:00
Gaetan Semet
b2d8d022f2 Merge remote-tracking branch 'upstream/master' 2013-06-11 14:52:46 +02:00
Matthew Robben
b1f41f6fa5 Update README.textile
Add upgrade command to docs. I canceled the prompt once and went hunting for this so I could upgrade.
2013-06-06 02:18:25 -03:00
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master'
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
2013-06-05 11:10:38 +02:00
Carlos Cardoso
ee3267f30d Merged official branch changes. 2013-06-03 22:12:29 -03: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
dd6247057e Updating the README file 2013-04-23 20:52:18 -07:00
Gaetan Semet
baa421cbae Merge branch 'master' of https://github.com/cadusk/oh-my-zsh
Conflicts:
	.gitignore
	templates/zshrc.zsh-template
	tools/install.sh
2013-03-04 16:54:51 +01:00
Ryan Castillo
60c3813472 Make the NOTE an optional for improved instructions 2012-12-01 21:10:23 -05:00
Ryan Castillo
5b201468d1 Improve formatting of step 2 for clarity 2012-12-01 21:03:07 -05:00
Carlos Cardoso
0a3db5bf2d Updated repository references. 2012-10-24 00:35:17 -02:00
Robby Russell
4199c1a6f7 Updating README to ask people to stop sending themes for now 2012-06-13 13:14:23 -07:00
westonplatter
083cff4a57 checking if airport allows git protocol 2012-06-08 12:18:26 -04:00
Justin Mazzi
7fd1bf597f Fix formatting 2012-04-25 11:02:17 -04:00
Justin Mazzi
6f4c69cb48 Add instructions on handling updates and prompts. 2012-04-25 11:59:53 -03:00
Tom Morris
071d0d68ec Added link to wiki page for plugins to README.
The wiki is more readable than going to the plugins directory.
2012-03-05 11:55:30 +00:00
Steven G. Harms
62a3ef6433 Grammar update 2012-01-21 13:24:07 -08:00
Robby Russell
480d1247b8 Updating installation documentation to show a curl example as well for those who don't have wget installed. 2011-12-26 10:15:35 -08:00
Jake Bell
f8aae64e47 Adding ability to override plugins from the custom directory. 2011-05-26 12:34:37 -05:00
Robby Russell
849e2834fb Updating the README... now links to contributors page 2011-04-12 10:36:45 +02:00
Simon Elsbrock
2497c57976 fixed wget command in readme
github uses a wildcard certificate which is not accepted by wget
2011-03-24 09:47:48 +01:00
Wim
ab1cbe9038 Should use https for all GitHub urls. 2011-02-14 01:19:01 -08:00