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
Andrea De Pasquale
12324856c6
Added ssh-like mosh window title
...
Display the hostname when running Mosh (http://mosh.mit.edu/ ).
Same thing as displaying "hostname" when running "ssh hostname".
2014-06-05 23:27:59 +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
Alexei Danchenkov
c5413d7dd1
Aligned comments
2014-03-20 19:34:43 -07:00
Alexei Danchenkov
55a9d685fd
Update key-bindings.zsh
...
Aligned comments
2014-03-20 19:29:06 -07:00
Alexei Danchenkov
e537ee9db9
added terminfo keys verification
2014-03-20 19:10:44 -07:00
Mariusz Fik
b56e8fb478
Ignore more users in ssh completion.
...
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-03-16 18:14:34 +01:00
Robby Russell
c9e7129341
Merge pull request #2602 from blueyed/use-default-hosts-completion-2
...
Use zsh's default for ':completion:*:hosts'
2014-03-15 16:03:30 -07:00
Robby Russell
552aab6939
Merge pull request #2591 from kevinxucs/remove-extra-aliases
...
Removed unsolicited aliases.
2014-03-13 13:29:12 -07:00
Daniel Hahler
71d9420637
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-03-13 17:48:58 +01:00
Robby Russell
7adf66f942
Merge pull request #1355 from F30/key-bindings
...
Use terminfo key codes instead of hardcoded ones for key bindings
2014-03-13 08:07:24 -07:00
Kaiwen Xu
b71a2b9d0f
Removed unsolicited aliases.
...
Those aliases should be in user's .zshrc file, instead of being default.
2014-03-10 04:05:14 -04:00
Robby Russell
48579ebf2b
Merge pull request #2341 from mcornella/title_backticks
...
Avoid evaluating special chars in $LINE on title command (fixes #2234 )
2014-03-08 14:30:55 -08:00
Robby Russell
9bd9278b80
Merge pull request #2287 from rumpelsepp/master
...
Added/modified some useful aliases.
2014-03-08 08:10:34 -08:00
Marc Cornellà
a951600b4e
Avoid 'title:parse error' with single quotes in $CMD
...
Fixes #2182
2014-02-21 22:16:12 +01:00
Marc Cornellà
3e5de21dc5
Revert previous commit, escape %
2014-02-21 22:16:12 +01:00
Marc Cornellà
b73ced397f
Use single quotes also in $LINE definiton
2014-02-21 22:16:12 +01:00
Marc Cornellà
b0fbe0d11a
Avoid evaluating special chars in $LINE on title command ( fixes #2234 )
2014-02-21 22:16:12 +01:00
Huang, Tao
217d8f0540
fc -l 1
instead of history
in zsh_stats #2501
...
$HIST_STAMP breaks zsh_stats. see #2501
2014-02-06 17:29:33 +08:00
LFDM
b0b79e0aba
No need to eval in rvm_prompt_info!
...
Just activate word-splitting.
2014-01-07 19:08:20 +01:00
LFDM
85fde31991
Renames the file to prompt_info_functions.zsh
2014-01-06 09:58:40 +01:00
LFDM
082607c165
Adds documentation.
2014-01-06 09:57:23 +01:00
LFDM
72392a2c27
Adds all other dummy implementations.
2014-01-06 09:57:09 +01:00
LFDM
6a40557a8b
Updates spectrum.zsh
2013-12-31 14:54:34 +01:00
LFDM
c6aacf611d
Refactors ruby_prompts.zsh
2013-12-31 02:45:09 +01:00
LFDM
8a887c5052
Joins ruby prompt files and adds ruby_prompt_info.
2013-12-31 02:11:02 +01:00
LFDM
7aa766168c
Adds chruby_prompt_info dummy function.
2013-12-31 01:44:51 +01:00
LFDM
ae6ded5ad7
Returns false when rbenv is not found.
2013-12-31 01:15:35 +01:00
LFDM
468b24a8d5
Returns false when rvm is not found.
2013-12-31 01:06:14 +01:00
LFDM
bbbff94cca
Fixes rvm_prompt_info() in lib/rvm.zsh
2013-12-31 00:35:57 +01:00
Michael Orr
9b811fb625
accidentally blew away a git config setting used for another purpose, renaming in order to distinguish
2013-12-06 17:31:35 -05:00
Bob Bonifield
f082d7a245
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
2013-12-04 20:59:57 -07:00
Robby Russell
f0a7adcd3d
Merge pull request #2176 from dejanlukan/spectrum
...
Added the spectrum_bls function, which prints all 256 colors set as the background.
2013-12-03 00:18:17 -08:00
Robby Russell
1dd9c43e12
Merge pull request #1134 from koraa/pull_req_helpers
...
Helpers for default variables and alias value access
2013-12-02 23:47:21 -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
Robby Russell
273728901e
Merge pull request #513 from randy909/fix-edit-cmdline
...
Fix edit-command-line binding
2013-12-02 23:03:03 -08:00
Robby Russell
fb614a0e80
Merge pull request #2229 from prubianes/master
...
Bazaar Integration Lib
2013-12-02 22:37:28 -08:00
Robby Russell
9357f2f41d
Merge pull request #2236 from Isquariel/nvm
...
Added function to show current Node.js version and new Bureau theme
2013-12-02 22:35:41 -08:00
Robby Russell
ac838345f5
Merge pull request #2270 from michaelorr/slow-git-fix
...
Optionally disable git_prompt_info with git config option for very large repos
2013-12-02 22:28:11 -08:00
Stefan Tatschner
c9f2c947e4
Added/modified some useful aliases.
2013-11-29 14:25:46 +01:00
Michael Orr
fbd479b68e
adding a check for git config option to disable git_prompt_info() on a per repo basis
2013-11-20 12:30:55 -05:00
Petter Abrahamsson
a7540844d5
Add support for colored ls output on OpenBSD
2013-11-14 07:06:54 -05:00
isquariel
5c73cb671b
Added nvm.zsh to detect current Node.js version
2013-11-08 23:26:05 +04:00
Pablo Rubianes
efc37c1f71
Modification to the frisk theme to work with the BZR lib
2013-11-06 20:10:59 -02:00
dejan
f057737e57
Added the spectrum_bls function, which prints all 256 colors set as the
...
background.
We can easily see which color we want to set when changing the PS1 shell variable,
since the colors are more distinctive.
2013-10-16 12:36:48 +02: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
4f8d6a8b15
Merge pull request #1773 from essembeh/master
...
Uncomment l alias
2013-06-25 09:10:05 -07:00
Robby Russell
0f2b24c1b8
Merge pull request #1887 from tgkokk/git-slow-fix
...
Fixed slow behavior when using GitHub wrappers
2013-06-21 07:07:26 -07:00
Theodore Kokkoris
9703eba66e
Fixed slow behavior when using GitHub wrappers
2013-06-12 20:04:08 +03:00
Ehren Kret
ab7604e5c2
Escape both % and $ in the command line
...
Fixes issue #1884
2013-06-11 11:37:35 -07:00
Christopher Roach
4ff861ee11
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
2013-05-19 12:55:10 -07:00
Sébastien M-B
f77a545a4b
Uncomment l alias
2013-04-28 16:34:36 +02:00
Robby Russell
b6ea876971
Merge pull request #690 from essembeh/master
...
Adding ~/.ssh/config parsing for host list and theme.
2013-04-23 21:27:51 -07:00
Robby Russell
8890df1251
Merge pull request #922 from sbfaulkner/master
...
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
Robby Russell
81ed0c4115
Resolving conflict with merge of #970
2013-04-23 20:44:35 -07:00
Robby Russell
685c746cc7
Merge pull request #1565 from serdardalgic/autoenv-plugin
...
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv.
2013-04-23 20:33:50 -07:00
Robby Russell
a2c8db9eb3
Resolving conflict in #1266 merge
2013-04-23 20:30:21 -07:00
Robby Russell
7cdb6d667c
Resolving conflict when merging in 1570
2013-04-23 20:21:18 -07:00
Robby Russell
b61555d7c0
Merge pull request #1582 from To1ne/pushdminus
...
use pushdminus
2013-04-23 20:16:41 -07:00
Robby Russell
8fea507b5c
Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
...
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
2013-04-23 20:04:08 -07:00
Robby Russell
30b0eb3ffa
Merge pull request #1740 from felipec/fc/git
...
git: fix parse_git_dirty()
2013-04-23 19:42:58 -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
Felipe Contreras
d615f64374
git: fix parse_git_dirty()
...
If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2013-04-21 02:56:39 -05:00
Robby Russell
085af13b47
Merge pull request #1531 from lcosmin/master
...
Fixed 'ls' issue on NetBSD
2013-04-12 06:16:54 -07:00
Robby Russell
cd55560c74
Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6
...
parse_git_dirty() support for Git 1.6
2013-04-07 19:06:31 -07:00
Christian Höltje
8890450684
This fixes checking for git untracked items
...
The grep expression was incorrect for normal grep. Adding
the `-E` option fixed the escaping of the question marks.
2013-04-03 20:41:05 -04:00
Robby Russell
b8b241f630
Merge pull request #749 from blueyed/setopt-correct
...
Only `setopt correct`, not "correct_all".
2013-03-26 22:14:20 -07:00
Robby Russell
5cde893ce0
Merge pull request #1661 from hellerbarde/master
...
Fix some problems with git enabled prompts where they *always* claim to have untracked files
2013-03-26 22:11:04 -07:00