linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-27 03:05:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3,282 commits 3 branches 0 tags 157 MiB
Commit graph

3,282 commits

This branch
This branch
All branches
Author SHA1 Message Date
r3dDoX
59c8fcc712 added new function to get number of commits ahead of remote 2014-05-25 14:13:21 +02:00
r3dDoX
3c485db8c7 replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0 2014-05-25 14:13:07 +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
Gaetan Semet
d5062e640e disable auto update 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-05-22 11:11:22 +02:00
Gaetan Semet
f1986b6a82 Merge remote-tracking branch 'upstream/master' 2014-05-22 11:10:25 +02:00
Gaetan Semet
1b034e178c new gcan! alias in the git plugin 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-05-22 11:09:15 +02:00
Gaetan Semet
3c6a720d5d apt get update alias 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-05-22 11:09:01 +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
Carlos Cardoso
62e09457f0 disabled terminal cleanup on pager (less) exit 2014-05-03 01:30:27 -03:00
Carlos Cardoso
ff0650d3f7 updated cadusk theme 2014-05-02 22:26:16 -03:00
Gaetan Semet
54a9bf74d5 add john in code review 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2014-05-02 12:11:11 +02:00
Carlos Cardoso
17b6871994 cadusk theme customization 2014-04-28 22:16:14 -03:00
Carlos Cardoso
9e29eb0645 update cadusk theme 2014-04-27 00:41:52 -03:00
Carlos Cardoso
53838bb9d1 theme customization based on avit and sporty_256 2014-04-26 23:29:34 -03:00
Nicolas Brousse
73bf940c34 Update brew.plugin.zsh 2014-04-23 19:44:59 +02:00
Gaetan Semet
316c46767e Merge remote-tracking branch 'upstream/master' 
Conflicts:
	tools/install.sh
 2014-04-23 14:45:49 +02: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
Carlos Cardoso
793cbb9450 removed duplicate aliases 2014-04-19 11:47:19 -03:00
Carlos Cardoso
d4db25b634 adding /usr/local/bin removed by mistake 2014-04-19 11:38:07 -03:00
Carlos Cardoso
4b8a93d68a merged in blessed/master 2014-04-19 11:18:40 -03: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
Carlos Cardoso
e2bede24ca updated python initialization for macosx 2014-04-19 11:12:30 -03: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
Benjamin Wong
6f3cf195c6 Spelling correction in itunes control function. 
Spelling correction in itunes control function.
 2014-04-18 22:43:23 +10:00
Robby Russell
a9061f34d7 Merge pull request #2633 from redsunsoft/agnoster-theme-git-mode-addition 
Added git support for merging, rebasing, and bisecting to agnoster theme
 2014-04-17 19:57:23 -07:00