Commit Graph

2597 Commits

Author SHA1 Message Date
Chris Krycho f82092a0e7 Add a command to show unresolve files in merge 2014-06-07 23:12:32 +02:00
Christian Höltje 67d74cbc2d Don't override ZSH_COMPDUMP if already set.
This allows customization via .zshenv if wanted. This is helpful
for zsh developers and people who want to move it out of $HOME
2014-06-07 10:13:21 +02:00
Marc Cornellà fbf4a78acf Show user prompt in gnzh theme regardless of UID
Fixes #2008.
2014-06-06 11:27:53 +02:00
n.st a9e1d9aa89 Cancel upgrade if $ZSH is not writable
from #2360
2014-06-04 19:37:14 +02:00
Jérôme Macias de41dee9e4 Add alias for container:debug task 2014-06-04 12:50:45 +02:00
ncanceill e5ed07e2b5 specify python2 in shebang
as suggested in #2382
2014-06-04 12:36:34 +02:00
Dražen Lučanin 7297b446b8 too many plugins = slow init warning 2014-06-04 10:53:19 +02:00
Yachi Lo 3cdfdad28a use ls instead of find to avoid incompatibility with gnu find 2014-06-02 16:11:22 +02:00
Doug Jones b1c97bc77e Fix comparison used to determine if the cache is outdated. 2014-06-02 16:11:22 +02:00
ncanceill ac1a321abe add gfa alias for recursive formatting
inspired from #2018
2014-05-29 11:06:02 +02:00
ncanceill 76e23e62c6 Fix permissions on wd plugin
continuating #1923
2014-05-29 10:58:51 +02:00
Theodore Kokkoris b569273012 Removed unnecessary execute permissions for some plugins 2014-05-29 10:58:17 +02:00
Christophe Bliard 3c41da3172 Update colorize.plugin.zsh
correctly detect when pygmentize is not installed
do not exit shell if when pygmentize is not installed
2014-05-29 10:56:41 +02:00
MrTux 3fac127152 Correct wrong plugin file name 2014-05-28 11:23:39 +02:00
Jim Hester 97ab436f7f Fix path for colemak plugin 2014-05-28 11:22:35 +02:00
Yuanxuan Wang 6bf7f39345 Steeef theme checks untracked files instead of directories 2014-05-28 11:20:41 +02:00
Andrey Koleshko 80828cd0d3 Update plugins/rbenv/rbenv.plugin.zsh
Fix rbenv plugin for OS X latest homebrew
2014-05-28 11:19:47 +02:00
James Magnarelli 7bb42fb49a Corrected syntax error in github plugin's empty_gh function 2014-05-28 11:19:16 +02:00
Frank Behrens 6fc241b0d2 extract plugin will unzip *.sublime-package files 2014-05-26 12:15:20 +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
pangratz c0b094cf85 Fix function/alias naming clash between bower and bundle plugin
Since the `bower` plugin specifies a `bi` alias and `bundle` plugin
specifies a `bi` function, there is a name clash when using both
plugins, which results in the message "Can't 'bundle install' outside a
bundled project" when trying to execute `bower`.

This adresses #2486
2014-05-25 11:15:12 +02:00
Simon Courtois b64e695b35 Ordering nocorrect aliases alphabetically 2014-05-24 20:07:06 +02:00
Simon Courtois cd8d5c4410 Defining nocorrect aliases only when ENABLE_CORRECTION is "true"
This commit move the nocorrect aliases definition so they're called
only when the user set ENABLE_CORRECTION to "true" to activate commands
autocorrection.
2014-05-24 20:07:05 +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
Mark Feltner 8d976e02b1 fix(tools/check_for_upgrade): Don't source profile
Reverts #2296, but mostly #1883.

There is no need to source ~/.profile when this script is read. oh-my-zsh writes no configuration data in ~/.profile.

If the user wishes to use data within ~/.profile, then they should source it in another place.

Fixes #2315
2014-05-24 19:51:08 +02:00
Brian Hartvigsen 5e601d6515 Fix dud alias. Switch --max-depth for just -d
As far as I can tell (tested on Linux & Darwin, BSD man page seems to agree), `-d` is pretty univerally accepted as the depth argument.  So instead of doing a test, we can just use -d and call it a day.
2014-05-24 19:48:36 +02:00
Brian Hartvigsen c1f5a1792b This is already done in lib/theme-and-appearance.zsh and supports Darwin/BSD/etc 2014-05-24 19:48:36 +02:00
Adam Luikart 9590b96b3f Write the update file even if `CLOBBER` is unset. 2014-05-24 19:40:30 +02:00
Trevor Strieber 8355233f7f Fixing typo. 2014-05-24 08:35:54 +02:00
Tony 0b4bf905f5 Minor markup edits 2014-05-24 08:34:22 +02:00
ncanceill 2c19c0e59e typo, fixes #1806 2014-05-24 08:31:59 +02:00
Robby Russell 3913106b2e Merge pull request #2787 from irnnr/plugin-vagrant
Support new Vagrant commands
2014-05-16 09:33:23 -07:00
Ingo Renner 8ed8005102 Improve consistency, remove dots at end of command descriptions 2014-05-15 12:26:39 -07:00
Ingo Renner 30d9952b62 [FEATURE] Support vagrant global-status
Vagrant 1.6 introduced the `global-status` command which allows
to get a quick overview of all active Vagrant environments for the
currently logged in user.
2014-05-06 10:53:12 -07:00
Ingo Renner 7f8ee9aabe [FEATURE] Support Vagrant Cloud commands
Vagrant 1.5 added Vagrant Cloud to share boxes. Some boxes
may be protected, the `login` command allows to access those
protected boxes from Vagrant Cloud.
2014-05-06 10:48:49 -07:00
Ingo Renner 38fe100efe [FEATURE] Support Vagrant Share
Vagrant 1.5 introduced Vagrant Share to allow remote access to a Vagrant
environment. This adds support for the `share` and `connect` commands.
2014-05-06 10:46:55 -07:00
Ingo Renner 236c8de7f3 [FEATURE] Support Vagrant 1.6 version command
Vagrant 1.6 introduces a couple new commands, including the `version` command.
The `version` command shows the currently installed version information and
also checks for new updates available.
2014-05-06 10:45:26 -07:00
Robby Russell eafd5f3252 Merge pull request #1635 from jimhester/per-directory-history
Update to latest per-directory-history
2014-04-19 12:56:21 -07:00
Robby Russell 11bf1a3a29 Merge pull request #2681 from mcornella/fix-zsh_reload-plugin
Various fixes on zsh_reload plugin
2014-04-19 12:55:56 -07:00
Robby Russell 4509228c53 Merge pull request #2728 from benwong/patch-2
Spelling correction in itunes control function.
2014-04-19 12:55:30 -07:00
Robby Russell 59de9aaa65 Merge pull request #2671 from ukrutt/master
Correct redirection of stderr
2014-04-19 12:55:09 -07:00
Robby Russell 01dcf51fdf Merge pull request #2502 from UniIsland/patch-1
`fc -l 1` instead of `history` in zsh_stats, fixes #2501
2014-04-19 12:54:35 -07:00
Robby Russell 5eb5f7138a Merge pull request #2511 from FloFra/master
Makes history-substring-search use term specific up and down buttons.
2014-04-19 12:54:10 -07:00
Robby Russell 8aa6e6a412 Merge pull request #2650 from kemko/patch-1
don't add --exclude-dir to GREP_OPTIONS on FreeBSD
2014-04-19 12:53:42 -07:00
Robby Russell ee31abfb2d Merge pull request #2729 from grodzik/master
Fix for Python3
2014-04-19 07:15:04 -07:00
Robby Russell 3b830aac8c Merge pull request #2693 from javiertejero/master
Fix `docker rmi` tab completion
2014-04-19 07:14:39 -07:00
Javier Tejero 7949a1cd8d Fix `docker rmi` tab completion
This is exactly what happens on tab completion for docker rmi. This commit
fixes that.

```sh
$ docker rmi <hit TAB>
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
_arguments:comparguments:312: invalid argument: __docker_images
```
2014-04-19 09:03:28 +02:00
Paweł Tomak cee52283d8 Fix for Python3
In Python3 without universal_newlines set to True
output from Popen was byte-encoded.
2014-04-18 23:09:38 +02:00
Dmitriy 9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04:00
Marc Cornellà fcfa323974 Use cache folder inside $ZSH, delete with unaliased rm 2014-04-18 17:07:23 +02:00