Commit graph

64 commits

Author SHA1 Message Date
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
Robby Russell
a2c8db9eb3 Resolving conflict in #1266 merge 2013-04-23 20:30:21 -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
Jeremy Attali
e41714d72c Added option to allow untracked files as non dirty
In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
2013-04-22 10:59:08 +02:00
Chris Borgia
52dc3b99f9 Edited Grammar in template file 2013-04-18 16:43:54 -04:00
Gaetan Semet
b964433381 Merge branch 'master' of https://github.com/Stibbons/oh-my-zsh
Conflicts:
	README.textile
	custom/plugins/launch_trial/_launch_trial.sh
	plugins/encode64/encode64.plugin.zsh
	plugins/git/git.plugin.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
	tools/install.sh

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-03-27 16:51:05 +01:00
Gaetan Semet
1c1ab1eaec updating scripts 2013-03-27 10:15:10 +01:00
Carlos Cardoso
b90e172390 disable ssh-agent. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
c5c0eadaf3 Added tmux plugin. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
848f059e6a Fixed customizations for mac and linux environments. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
7a34d01628 Fixed aliases and theme appearance. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
fb15c83086 Updated repository references. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
2a85404a82 My custom zshrc's 2013-03-27 10:10:33 +01:00
Carlos Cardoso
d17330b34d Disable correction suggestions. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
f1288297c7 Updated virtualenv initialization. 2013-03-27 10:10:32 +01:00
Carlos Cardoso
73f0d5f79e New customizations. 2013-03-27 10:09:35 +01:00
Carlos Cardoso
ea57d2cb7c set pythonbrew plugin as initializable. 2013-03-27 10:08:13 +01:00
cadusk@yahoo.com.br
7be8212634 Removido plugin 'osx' da inicializacao automatica. 2013-03-27 10:08:13 +01:00
Carlos Cardoso
0d6232722a Atualizado default LC_ALL e LANG 2013-03-27 10:08:12 +01:00
Carlos Cardoso
2deeed1301 redirecionamento de vim para 7.3 2013-03-27 10:08:12 +01:00
Carlos Cardoso
5c95ca4caf Changed shell theme 2013-03-27 10:07:26 +01:00
Carlos Cardoso
c6e8fa92ea Added new virtualenvwrapper plugin 2013-03-27 10:05:54 +01:00
Carlos Cardoso
eda24dcb75 My zsh config 2013-03-27 10:04:53 +01: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
Gaetan SEMET
f84b2eddeb Creating new completion scheme for buildbot and repo tools 2013-02-12 14:50:46 +01:00
Robby Russell
ded745bf14 Modifying documentation in zshrc template for new config option 2012-11-30 05:58:08 -08:00
Eric Danielson
200a25818a Add UPDATE_ZSH_DAYS setting 2012-11-26 11:35:16 -08:00
Carlos Cardoso
1ce4265072 disable ssh-agent. 2012-10-27 13:27:20 -02:00
Carlos Cardoso
c071030b68 Added tmux plugin. 2012-10-25 21:22:32 -02:00
Carlos Cardoso
ba136bb773 Fixed customizations for mac and linux environments. 2012-10-25 21:10:15 -02:00
Carlos Cardoso
623c4b2ac3 Fixed aliases and theme appearance. 2012-10-25 14:16:27 -02:00
Carlos Cardoso
0a3db5bf2d Updated repository references. 2012-10-24 00:35:17 -02:00
Carlos Cardoso
6c10907143 My custom zshrc's 2012-10-06 10:32:40 -03:00
Carlos Cardoso
2230bea1d4 Disable correction suggestions. 2012-10-03 23:18:31 -03:00
Carlos Cardoso
fe80ab4baa Updated virtualenv initialization. 2012-09-25 01:15:15 -03:00
Morgan Larosa
682961e930 Add a configuration option to disable autocorrect 2012-07-28 08:25:15 +10:00
Carlos Cardoso
402053ff37 Changed default theme. 2012-07-27 01:06:57 -03:00
Carlos Cardoso
e7fcb09088 New customizations. 2012-07-05 13:34:53 -03:00
Carlos Cardoso
73c69e7f1a set pythonbrew plugin as initializable. 2012-06-29 00:06:57 -03:00
Carlos Cardoso
c5f7019aa5 imported changes from robbyrussell 2012-06-28 23:56:07 -03:00
cadusk@yahoo.com.br
0222b0af11 Removido plugin 'osx' da inicializacao automatica. 2012-05-22 13:47:50 -03:00
Carlos Cardoso
0d0ae39af0 Atualizado default LC_ALL e LANG 2012-05-19 11:19:17 -03:00
Carlos Cardoso
029ad2828c redirecionamento de vim para 7.3 2012-05-14 04:51:28 -03:00
Carlos Cardoso
b62fd80202 Changed shell theme 2012-05-01 10:16:00 -04:00
Carlos Cardoso
6a10614609 Added new virtualenvwrapper plugin 2012-04-08 22:34:38 -03:00
Carlos Cardoso
4d6947ca0f My zsh config 2012-04-07 23:00:34 -03:00
Robby Russell
c41807c82f Merge pull request #776 from mytechnix/master
Added examples aliases in ZSH config template and new theme.
2011-12-26 10:09:09 -08:00
Michael Holachek
f999fd8e12 Added example aliases in ZSH template. Added a new theme.
Example aliases allow for an easier way to open ZSH config file/folder
in Textmate. New theme is mh.zsh-theme.
2011-12-26 12:20:02 -05:00
Trevor Wennblom
a21dc477c2 add note about custom plugins 2011-12-20 16:16:02 -06:00
Robby Russell
9d67d75b0a Revert "Enable red dots during completion by default".
After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.

This reverts commit fc49b4a4de.
2011-08-30 20:56:13 -07:00