sachin21
fcee52e25d
This alias is conflict cause
2014-11-28 14:37:14 +01:00
Jingwen Owen Ou
82def2e648
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-11-28 14:37:14 +01:00
Fredrik Fornwall
0abd191230
Replace /usr/bin/env with env
...
Some environments (such as Android) does not have /usr/bin.
2014-11-28 14:37:14 +01:00
Moinak Ghosh
a8e196efce
Solaris portability tweaks.
2014-11-28 14:37:11 +01:00
Simon Buchan
7794c7493a
Fix POST_1_7_2_GIT check for parse_git_dirty submodules.
2014-11-28 14:37:11 +01:00
Simon Buchan
24184cf8eb
Fix parse_git_dirty() when status.branch is set.
2014-11-28 14:37:11 +01:00
Albert Krewinkel
7b49bbeb59
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-11-28 14:37:08 +01:00
Mikhail S. Pobolovets
784fc4ec30
Add missing command wrapper for git
...
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2014-11-28 14:37:08 +01:00
Will Boyce
6e9619a451
ignore usernames beginning with underscore
2014-11-28 14:37:07 +01:00
ncanceill
532590f74b
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-11-28 14:37:07 +01:00
r3dDoX
23ae076e3c
added prefix/suffix variable for customizability
2014-11-28 14:37:06 +01:00
r3dDoX
c22dfffe38
added new function to get number of commits ahead of remote
2014-11-28 14:37:06 +01:00
r3dDoX
ceb7c926f3
replaced hardcoded origin/{branch-name} with @{upstream} which gets the upstream branch since git 1.7.0
2014-11-28 14:37:06 +01:00
Simon Courtois
1c72726ddc
Ordering nocorrect aliases alphabetically
2014-11-28 14:37:06 +01:00
Simon Courtois
ae27cd70b7
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-11-28 14:37:06 +01:00
Dmitriy
9eeaadbcbb
set exclude-dir or exclude grep flags only if available
2014-11-28 14:37:02 +01:00
Andre Eriksson
83fb3414d0
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-11-28 14:37:01 +01:00
Marc Cornellà
2089294b0e
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-11-28 14:36:58 +01:00
Marc Cornellà
200a624c4e
Fix export syntax of $GREP_OPTIONS
...
Fixes #2641 , #2642
2014-11-28 14:36:51 +01:00
nXqd
b9a2da61c7
avoid VCS folders
2014-11-28 14:36:43 +01:00
Marc Cornellà
cd2b97fa94
Fix export syntax of $GREP_OPTIONS
...
Fixes #2641 , #2642
2014-11-28 14:36:32 +01:00
Alexei Danchenkov
1e93130b1f
Added a forward-delete fallback to bind Delete key
...
Delete key (of Fn+Delete on Mac) would print "~" instead of deletion.
2014-11-28 14:36:32 +01:00
Alexei Danchenkov
2440d9f769
Aligned comments
2014-11-28 14:36:32 +01:00
Alexei Danchenkov
4540ad11d4
Update key-bindings.zsh
...
Aligned comments
2014-11-28 14:36:32 +01:00
Alexei Danchenkov
583ab0662e
added terminfo keys verification
2014-11-28 14:36:32 +01:00
Mariusz Fik
e74934b4af
Ignore more users in ssh completion.
...
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-11-28 14:36:31 +01:00
Daniel Hahler
186ba1161c
Use zsh's default for ':completion:*:hosts'
...
The manual configuration of ':completion:*:hosts' causes some problems
(e.g. issue #1337 ), and misses useful information (especially from
~/.ssh/known_hosts; issue #690 and issue #1009 ).
The best option appears to be using zsh's default configuration for
':completion:*:hosts'.
While rebasing this for a new pull request (#1498 got closed by accident
and then requests to re-open it got ignored), it also drops the `users
off` setting: completion of user names can be useful, and the commit
adding it (c4434d2 ) does not state why.
2014-11-28 14:36:31 +01:00
Kaiwen Xu
e3c5b0c837
Removed unsolicited aliases.
...
Those aliases should be in user's .zshrc file, instead of being default.
2014-11-28 14:36:30 +01:00
Marc Cornellà
aaafe52301
Avoid 'title:parse error' with single quotes in $CMD
...
Fixes #2182
2014-11-28 14:36:29 +01:00
Marc Cornellà
4e635728d7
Revert previous commit, escape %
2014-11-28 14:36:29 +01:00
Marc Cornellà
e109741135
Use single quotes also in $LINE definiton
2014-11-28 14:36:29 +01:00
Marc Cornellà
b864492570
Avoid evaluating special chars in $LINE on title command ( fixes #2234 )
2014-11-28 14:36:29 +01:00
Huang, Tao
14ddfe4841
fc -l 1 instead of history in zsh_stats #2501
...
$HIST_STAMP breaks zsh_stats. see #2501
2014-11-28 14:36:28 +01:00
LFDM
6629d2c7a6
No need to eval in rvm_prompt_info!
...
Just activate word-splitting.
2014-11-28 14:36:27 +01:00
LFDM
270ae21422
Renames the file to prompt_info_functions.zsh
2014-11-28 14:36:27 +01:00
LFDM
de0cabd180
Adds documentation.
2014-11-28 14:36:27 +01:00
LFDM
af4245d123
Adds all other dummy implementations.
2014-11-28 14:36:27 +01:00
LFDM
0262abd54b
Updates spectrum.zsh
2014-11-28 14:36:27 +01:00
LFDM
30a87b44d0
Refactors ruby_prompts.zsh
2014-11-28 14:36:24 +01:00
LFDM
cec97ea2d6
Joins ruby prompt files and adds ruby_prompt_info.
2014-11-28 14:36:24 +01:00
LFDM
15c64fedb5
Adds chruby_prompt_info dummy function.
2014-11-28 14:36:24 +01:00
LFDM
a7804cda65
Returns false when rbenv is not found.
2014-11-28 14:36:24 +01:00
LFDM
78005e6430
Returns false when rvm is not found.
2014-11-28 14:36:23 +01:00
LFDM
f7d46ec4a6
Fixes rvm_prompt_info() in lib/rvm.zsh
2014-11-28 14:36:23 +01:00
Michael Orr
90be3d9f05
accidentally blew away a git config setting used for another purpose, renaming in order to distinguish
2014-11-28 14:36:23 +01:00
Bob Bonifield
fdd01e36cb
Making auto-correction off by default
...
- Allows for the user to turn on auto-correction using the
$ENABLE_CORRECTION variable
- Adds aliases regardless of variable assignment to aid users that use
setopt to turn correction back on in their zshrc
2014-11-28 14:36:23 +01:00
Stefan Tatschner
87e6505f67
Added/modified some useful aliases.
2014-11-28 14:36:22 +01:00
Michael Orr
f9b3711624
adding a check for git config option to disable git_prompt_info() on a per repo basis
2014-11-28 14:36:22 +01:00
Petter Abrahamsson
bed736e74f
Add support for colored ls output on OpenBSD
2014-11-28 14:36:21 +01:00
isquariel
e1e3dced73
Added nvm.zsh to detect current Node.js version
2014-11-28 14:36:21 +01:00