Commit graph

62 commits

Author SHA1 Message Date
Aaron Biggs
47beefb6e1 Fix plugins call 2017-12-18 10:32:12 -06:00
Aaron Biggs
329b4da0b0 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
# Conflicts:
#	lib/aliases.zsh
#	lib/misc.zsh
#	lib/theme-and-appearance.zsh
#	templates/zshrc.zsh-template
#	themes/agnoster.zsh-theme
#	tools/install.sh
2017-12-08 10:24:18 -06:00
Robby Russell
7a7480b987 Updating template and README to list plugins on individual lines vs one long one. Easier scanning for you and me. 2017-11-08 10:46:40 -08:00
Robby Russell
a1d13aa0b4 Merge branch 'Random_Theme_From_List' of https://github.com/Gnouc/oh-my-zsh into Gnouc-Random_Theme_From_List 2017-11-01 05:35:37 -07:00
Timothy Blumberg
b94d9e26e5 Changed dsa --> rsa in zshrc.zsh-template file (#5603) 2016-11-02 17:53:54 +01:00
Aaron Biggs
46cc45d332 Add SSH passphrase to Keychain on startup 2016-10-14 15:45:54 -05:00
Marc Cornellà
9e81b79d90 Reorder zshrc template 2016-08-23 09:42:32 +02:00
Felipe Vargas
551abfcbb4 Remove undesirable hardcoding of PATH into zshrc (#4925)
See robbyrussell@b67961d
2016-06-16 21:56:34 +02:00
LE Manh Cuong
5e77e00ad5 Some improvements
- Adding documentation
 - Note the effect empty array
 - Fix spelling
 - Using new test `[[...]]`
2015-12-18 14:15:38 +07:00
LE Manh Cuong
531c41cdfe Allow loading themes from predefined list 2015-12-18 08:28:22 +07:00
Aaron Biggs
dafdd1f334 Remove old Capistrano and Laravel4 plugin support. 2015-08-06 08:21:49 -05:00
Jordan Klassen
45121611fe Update template zshrc with HYPHEN_INSENSITIVE 2015-05-01 15:10:45 -07:00
Doan Truong Thi
b6b1dd3cd7 Fix Yosemite broken zsh where $PATH var does not get appended correctly.
Sourcing oh-my-zsh immediately after export PATH.
2014-11-21 10:07:23 +09:00
Aaron Biggs
586f235bc6 Added Composer bin to path 2014-09-28 10:50:15 -05:00
Aaron Biggs
b28391cf7f Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/common-aliases/common-aliases.plugin.zsh
	templates/zshrc.zsh-template
2014-07-29 14:49:44 -05:00
Aaron Biggs
ca14eb83b4 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh into test-pull
Conflicts:
	themes/agnoster.zsh-theme
	tools/install.sh
2014-06-11 08:59:00 -05:00
Aaron Biggs
05858b07ef Added Laravel4 plug-in for autocomplete 2014-06-11 08:43:24 -05:00
Dražen Lučanin
7297b446b8 too many plugins = slow init warning 2014-06-04 10:53:19 +02:00
Sean McCann
1ad1c52797 Move aliases to 'custom' section of .zshrc template
By convention, user-specific aliases are kept in each user's .zshrc
file. The .zshrc template provided by oh-my-zsh has an area for example
aliases, though these were being loaded before other aliases in libs, plugins,
and themes. As a result, personal aliases could be overwritten by these
other aliases as they are loaded. To make personal customization easier, the
sample aliases section of the .zshrc template has been moved to the area
dedicated for personal customization. This section of the configuration
is processed after all other items are loaded, preventing personal aliases
and exports from being inadvertently clobbered by oh-my-zsh.
2014-05-25 22:55:56 +02:00
Simon Courtois
4c64cf4a25 Replacing DISABLE_CORRECTION with ENABLE_CORRECTION in zshrc template
Since commands auto-correction must be explicitly enable with
the ENABLE_CORRECTION envvar, this commit replaces the unaccurate
example in the zshrc template.
2014-05-24 20:07:05 +02:00
Aaron Biggs
2f12d0d7a1 Moved '$ZSH/oh-my-zsh.sh' back above User Config. 2014-04-13 12:24:12 -05:00
Luke Horvat
5f09d0f6dd Fixed typos + made wording more consistent in zshrc.zsh-template 2014-03-25 22:12:30 +11:00
ncanceill
6889dfaa46 $ZSH is the OMZ installation folder, not configuration 2014-03-23 15:03:36 +01:00
ncanceill
04c2d29398 mention $ZSH_CUSTOM as suggested in #2295 2014-03-23 15:03:16 +01:00
ncanceill
f9ad3686bb suggest setting $LANG to fix #1286 and fix #1823 2014-03-23 15:02:58 +01:00
Robby Russell
95302af79b Merge pull request #646 from whittle/master
Change default zshrc to export $ZSH (as required by check_for_upgrade.sh).
2014-03-22 13:51:47 -07:00
Aaron Biggs
1964e12e5d Added sublime plugin. 2014-01-16 08:51:09 -06:00
Aaron Biggs
70da274774 Added theme. Added more plugins. 2014-01-09 07:34:53 -06:00
Aaron Biggs
fa3036a7a0 Added rbenv plugin. 2014-01-08 15:34:25 -06:00
Foivos
e97811913b Improve comments 2013-12-08 07:16:40 +02:00
Foivos
be6b1b3b8f Improve comments 2013-12-08 07:11:33 +02:00
Robby Russell
0d352109e9 Merge pull request #1087 from avit/install-template
Add configuration placeholders to installer template
2013-12-02 23:49:00 -08:00
Robby Russell
44c7fd976b Merge pull request #1928 from dongweiming/add-hist-stamp
Add option for show in the command execution time stamp in the history
2013-12-02 23:38:26 -08:00
Andrew Vit
1e9f55f09d Add configuration placeholders to installer template
Although the zshrc template adds a PATH= string, this is overwritten by the installer script.
This allows it to be placed anywhere in the file instead of having to append at the end.
2013-10-25 14:50:27 -07:00
David Strawn
9d2b5c841e Fixed comments in zshrc.zsh-template about disabling auto updates.
Previously they did not make sense nor were they accurate.
2013-09-14 12:26:33 -06:00
dongweiming
77cf869605 Add option for show in the command execution time stamp in the history 2013-06-30 20:54:23 +08: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
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
Morgan Larosa
682961e930 Add a configuration option to disable autocorrect 2012-07-28 08:25:15 +10: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
Jason Whittle
de29ef809d Change default zshrc to export $ZSH (as required by check_for_upgrade.sh). 2011-10-05 00:57:48 -03: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
Loïc Yhuel
fc49b4a4de Enable red dots during completion by default 2011-07-28 19:52:53 +02:00
Loïc Yhuel
0848acfb25 Display red dots during completion process (disabled by default) 2011-07-24 21:48:21 +02:00