adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,875 Commits 2 Branches 0 Tags 19 MiB
9b352030b7
Commit Graph

337 Commits

Author SHA1 Message Date
Robby Russell
9b352030b7 Merge pull request #3409 from unixorn/prevent-variable-clobbering 
Add quoting to nvm.sh
 2014-12-19 20:21:33 -08:00
Joe Block
16d0768305 Quote path in case $HOME has a space in it. 
I've seen stranger things on OS X, unfortunately.
This reverts commit 1f5cecee4768be192e439a72a873a6cfe8720927.
 2014-12-16 13:22:31 -08:00
Robby Russell
1978a0923c Revert PR #3359 as this is breaking stuff for many folks. Need to rethink how we handle system defaults differently on this 2014-12-15 08:11:04 -08:00
Robby Russell
885e8187ad Merge pull request #3359 from unixorn/dont-clobber-histsize-and-savehist 
Don't clobber $HISTSIZE and $SAVEHIST
 2014-12-14 16:34:08 -08:00
Robby Russell
eced76e0fd Merge pull request #3326 from DanielFGray/master 
ignore any grep aliases that might be defined
 2014-12-14 16:32:11 -08:00
Ondřej Súkup
dd27087805 Change to alias and remove deprecated GREP_COLOR 2014-12-13 19:57:23 +01:00
Marc Cornellà
711843153d Tidy up the grep.zsh library 2014-12-13 19:52:49 +01:00
Marc Cornellà
0190eb084b Use unaliased grep in flag check 2014-12-13 19:45:04 +01:00
Marc Cornellà
cf586b54b8 Ignore .bzr folders in grep too 2014-12-13 19:45:02 +01:00
Marc Cornellà
0bd3c9996f Extract VCS folders definition to avoid repetition 2014-12-13 19:44:38 +01:00
Joe Block
5bf715787a Existing code indents with spaces, not tabs, conform. 2014-11-30 17:39:21 -08:00
Joe Block
1ebc98b9ed Don't clobber HISTSIZE or SAVEHIST if they're already set 2014-11-30 17:37:47 -08:00
Marc Cornellà
a301f567e3 Switch back to oh-my-zsh.hide-dirty setting again 
Commit 81004dfaba reverted the change
in 9b811fb625 when editing the merge
conflict from #2928.

This commit fixes that so that we don't make the same mistake again.

First seen in http://git.io/Cdaj5Q
 2014-11-19 18:40:18 +01:00
DanielFGray
00ec11d3c0 ignore any grep aliases that might be defined 2014-11-16 02:47:35 -06:00
Marc Cornellà
74177c5320 Change all whoami calls for $USER variable 
This avoid spawning additional processes, as the $USER variable will
**always** contain the current logged-in user.
 2014-11-06 18:33:56 +01:00
Robby Russell
57ff83db59 Merge pull request #2946 from moinakg/master 
Solaris portability tweaks.
 2014-11-06 09:26:48 -08:00
Robby Russell
81004dfaba 2928 merge conflict 2014-11-06 09:24:00 -08:00
Robby Russell
160abc9a8d Merge pull request #2323 from michaelorr/slow-git-fix 
Renaming config for parse_git_dirty() to avoid collision
 2014-11-06 09:15:00 -08:00
Marc Cornellà
36e05e95ad Don't set auto_name_dirs because it messes up prompts 
From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4

> AUTO_NAME_DIRS
> Any parameter that is set to the absolute name of a directory immediately
> becomes a name for that directory, that will be used by the ‘%~’ and
> related prompt sequences, and will be available when completion is performed
> on a word starting with ‘~’.
> (Otherwise, the parameter must be used in the form ‘~param’ first.)

Explained in more detail in
https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194

Related issues:
https://github.com/robbyrussell/oh-my-zsh/issues/2857
https://github.com/robbyrussell/oh-my-zsh/issues/3238
https://github.com/wayneeseguin/rvm/issues/3091
 2014-10-22 15:39:27 +02:00
Moinak Ghosh
5f38a537ce Update Solaris changes to use OSTYPE and zsh datetime module. 2014-09-16 22:29:52 +05:30
Robby Russell
958c8f4390 Merge pull request #3045 from fornwall/remove-usr-bin 
Replace /usr/bin/env with env
 2014-08-31 10:40:19 -07:00
Robby Russell
be578d9e7a Merge pull request #3053 from jingweno/patch-1 
Fix missing add-zsh-hook
 2014-08-31 10:39:03 -07:00
Robby Russell
a1c5abf6bf Merge pull request #3055 from sachin21/remove_alias 
This alias is conflict cause.
 2014-08-31 10:25:34 -07:00
sachin21
ac053f4211 This alias is conflict cause 2014-08-24 00:50:54 +09:00
Jingwen Owen Ou
dc9e1764cf Fix missing add-zsh-hook 
In older version of zsh, `add-zsh-hook` is not available, causing issues like:

```
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:32: add-zsh-hook: function definition file not found
/Users/hugo/.oh-my-zsh/lib/termsupport.zsh:33: add-zsh-hook: function definition file not found
```

See https://github.com/robbyrussell/oh-my-zsh/issues/748. This patch pulls in the changes suggested in https://github.com/robbyrussell/oh-my-zsh/issues/748#issuecomment-37862691 by @mcornella and I have tested it on RHEL 5.
 2014-08-22 15:59:17 -07:00
Fredrik Fornwall
dac2a6e27a Replace /usr/bin/env with env 
Some environments (such as Android) does not have /usr/bin.
 2014-08-20 23:52:05 +02:00
Robby Russell
01da53e10f Merge pull request #2828 from r3dDoX/master 
removed a hardcoded 'origin' in git.zsh and added new function for number of commits ahead of remote
 2014-07-15 07:38:55 -07:00
Moinak Ghosh
5e328e3a9c Solaris portability tweaks. 2014-07-11 18:41:49 +05:30
Simon Buchan
2927ce3714 Fix POST_1_7_2_GIT check for parse_git_dirty submodules. 2014-07-03 14:45:49 +12:00
Simon Buchan
676fb4e420 Fix parse_git_dirty() when status.branch is set. 2014-07-03 14:38:19 +12:00
Albert Krewinkel
c5d9fc9968 git_prompt_info: ignore git-config errors 
Merged from #2906

The function `git_prompt_info` calls `git config` for its stdout output,
but doesn't handle the stderr output.  This can lead to problems,
e.g. if the git config file is unreadable for some reason (permissions
etc).

This fixes the issue by simply ignoring the stderr output.
 2014-06-28 10:12:20 +02:00
Mikhail S. Pobolovets
49161e7847 Add missing command wrapper for git 
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
 2014-06-28 10:12:19 +02:00
Will Boyce
09fdf76311 ignore usernames beginning with underscore 2014-06-10 13:33:33 +02:00
ncanceill
7fbbf28e6e return 0 when not a git repo 
before, 128 was returned, which could display an error,
but out of a git repo this should exit silently
fixes #2226
 2014-06-10 09:52:57 +02:00
r3dDoX
514693125b added prefix/suffix variable for customizability 2014-05-26 10:47:51 +02:00
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
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
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
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
Dmitriy
9385b3ee0a set exclude-dir or exclude grep flags only if available 2014-04-19 00:03:36 +04:00
Robby Russell
175310ae27 Merge pull request #2661 from mcornella/fix_title_tab_percent 
Fix escaping of $CMD of automatic title
 2014-03-27 21:31:04 -07:00
Andre Eriksson
9650861e56 Fix broken reverse-menu-complete keybinding. 
Since e537ee9, the reverse-menu-complete keybinding has no longer been
properly bound (it was accidentally bound to the delete key).

This commit again binds it to shift-tab.
 2014-03-26 15:12:39 +09:00
Marc Cornellà
5137e0e509 Escape % in $CMD variable 
Fixes formatting on some rare cases when a percent ends up
in the $CMD variable, like these below:

- When assigning a variable, $CMD ends up with the second parameter;
in this case, $CMD will contain '+%s%N', messing with the syntax:

 $ a=`date +%s%N`

- A function (or command in general) that contains a percent symbol:

 $ to\%() { echo $(( $1 * 100 / $3))\% } # $CMD=to%()
 $ to% 2 of 10 # $CMD=to%
 2014-03-25 21:14:20 +01:00
Robby Russell
27965fedec Merge pull request #2390 from LFDM/updating_spectrum 
Updates and refactors spectrum.zsh
 2014-03-23 11:39:07 -07:00
Marc Cornellà
12e30faaca Fix export syntax of $GREP_OPTIONS 
Fixes #2641, #2642
 2014-03-23 02:09:38 +01:00
Robby Russell
393c805f7e Merge pull request #1162 from nXqd/patch-1 
avoid VCS folders
 2014-03-22 16:07:51 -07:00
Robby Russell
9eacd7d589 Merge pull request #750 from blueyed/history-drop-default-append-history 
`setopt append_history` is not necessary.
 2014-03-22 13:59:19 -07:00
Alexei Danchenkov
32a7824182 Added a forward-delete fallback to bind Delete key 
Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
 2014-03-21 09:24:59 -07:00