83c4e06206
Moves a bindkey call from misc to key-bindings.
2015-02-10 19:22:39 +01:00
101149b1ae
Moves remaining aliases to misc and deletes file.
...
There were only three aliases left in aliases.zsh
File deleted!
2015-02-10 19:22:39 +01:00
d33b0aae91
Refactors history alias and moves it.
...
More compact case statement instead of the ugly if elif... else
statement. Moves it to history.zsh
2015-02-10 19:22:39 +01:00
25b1cd687b
Brings all directory stuff to directories.zsh
...
- Cleans out aliases.zsh.
- Removes unneeded cd function.
2015-02-10 19:22:38 +01:00
c3eb54839a
Merge pull request #3525 from apjanke/term-pwd-in-precmd
...
Move pwd update output to precmd to avoid contamination
2015-02-10 07:27:03 -08:00
be7028012e
Reword comments on termsupport internal functions.
2015-02-04 01:00:51 -05:00
f2130fa1a3
Test if --color=auto is a valid option for grep
2015-02-02 20:49:24 +01:00
550ccca91c
Merge pull request #3478 from stephenrjohnson/custom_cache_dir
...
Allow custom cache dir
2015-01-31 06:23:50 -06:00
5f79ab5547
Move chpwd update output from chpwd hook to precmd to avoid
...
contaminating script/function output
2015-01-27 21:00:07 -06:00
bf7b9165fd
Allow custom cache dir
...
We are running oh-my-zsh on a shared install and the only issue is each
user having a custom cache dir. This will allow us to set the cache dir
to ZSH_CACHE_DIR=~/oh-my-zsh/cache/ .
2015-01-08 16:01:16 +00:00
7295e38885
termsupport: add chpwd hook for setting pwd in Apple Terminal.app
2014-12-21 15:05:22 -05:00
9b352030b7
Merge pull request #3409 from unixorn/prevent-variable-clobbering
...
Add quoting to nvm.sh
2014-12-19 20:21:33 -08:00
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
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
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
eced76e0fd
Merge pull request #3326 from DanielFGray/master
...
ignore any grep aliases that might be defined
2014-12-14 16:32:11 -08:00
dd27087805
Change to alias and remove deprecated GREP_COLOR
2014-12-13 19:57:23 +01:00
711843153d
Tidy up the grep.zsh library
2014-12-13 19:52:49 +01:00
0190eb084b
Use unaliased grep in flag check
2014-12-13 19:45:04 +01:00
cf586b54b8
Ignore .bzr folders in grep too
2014-12-13 19:45:02 +01:00
0bd3c9996f
Extract VCS folders definition to avoid repetition
2014-12-13 19:44:38 +01:00
5bf715787a
Existing code indents with spaces, not tabs, conform.
2014-11-30 17:39:21 -08:00
1ebc98b9ed
Don't clobber HISTSIZE or SAVEHIST if they're already set
2014-11-30 17:37:47 -08:00
a301f567e3
Switch back to oh-my-zsh.hide-dirty setting again
...
Commit 81004dfaba9b811fb625#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
00ec11d3c0
ignore any grep aliases that might be defined
2014-11-16 02:47:35 -06:00
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
57ff83db59
Merge pull request #2946 from moinakg/master
...
Solaris portability tweaks.
2014-11-06 09:26:48 -08:00
81004dfaba
2928 merge conflict
2014-11-06 09:24:00 -08:00
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
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
5f38a537ce
Update Solaris changes to use OSTYPE and zsh datetime module.
2014-09-16 22:29:52 +05:30
958c8f4390
Merge pull request #3045 from fornwall/remove-usr-bin
...
Replace /usr/bin/env with env
2014-08-31 10:40:19 -07:00
be578d9e7a
Merge pull request #3053 from jingweno/patch-1
...
Fix missing add-zsh-hook
2014-08-31 10:39:03 -07:00
a1c5abf6bf
Merge pull request #3055 from sachin21/remove_alias
...
This alias is conflict cause.
2014-08-31 10:25:34 -07:00
ac053f4211
This alias is conflict cause
2014-08-24 00:50:54 +09:00
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
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
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
5e328e3a9c
Solaris portability tweaks.
2014-07-11 18:41:49 +05:30
2927ce3714
Fix POST_1_7_2_GIT check for parse_git_dirty submodules.
2014-07-03 14:45:49 +12:00
676fb4e420
Fix parse_git_dirty() when status.branch is set.
2014-07-03 14:38:19 +12:00
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
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
09fdf76311
ignore usernames beginning with underscore
2014-06-10 13:33:33 +02:00
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
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
514693125b
added prefix/suffix variable for customizability
2014-05-26 10:47:51 +02:00
59c8fcc712
added new function to get number of commits ahead of remote
2014-05-25 14:13:21 +02:00
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
b64e695b35
Ordering nocorrect aliases alphabetically
2014-05-24 20:07:06 +02:00
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
f516b7c7f5
add check for colored ls on openbsd. (retry of #2225 )
2014-04-25 14:15:14 +02:00
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
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
9385b3ee0a
set exclude-dir or exclude grep flags only if available
2014-04-19 00:03:36 +04:00
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
9650861e56
Fix broken reverse-menu-complete keybinding.
...
Since e537ee9
2014-03-26 15:12:39 +09:00
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
27965fedec
Merge pull request #2390 from LFDM/updating_spectrum
...
Updates and refactors spectrum.zsh
2014-03-23 11:39:07 -07:00
12e30faaca
Fix export syntax of $GREP_OPTIONS
...
Fixes #2641 , #2642
2014-03-23 02:09:38 +01:00
393c805f7e
Merge pull request #1162 from nXqd/patch-1
...
avoid VCS folders
2014-03-22 16:07:51 -07:00
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
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
c5413d7dd1
Aligned comments
2014-03-20 19:34:43 -07:00
55a9d685fd
Update key-bindings.zsh
...
Aligned comments
2014-03-20 19:29:06 -07:00
e537ee9db9
added terminfo keys verification
2014-03-20 19:10:44 -07:00
b56e8fb478
Ignore more users in ssh completion.
...
Signed-off-by: Mariusz Fik <fisiu@opensuse.org>
2014-03-16 18:14:34 +01:00
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
552aab6939
Merge pull request #2591 from kevinxucs/remove-extra-aliases
...
Removed unsolicited aliases.
2014-03-13 13:29:12 -07:00
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
2014-03-13 17:48:58 +01:00
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
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
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
9bd9278b80
Merge pull request #2287 from rumpelsepp/master
...
Added/modified some useful aliases.
2014-03-08 08:10:34 -08:00
a951600b4e
Avoid 'title:parse error' with single quotes in $CMD
...
Fixes #2182
2014-02-21 22:16:12 +01:00
3e5de21dc5
Revert previous commit, escape %
2014-02-21 22:16:12 +01:00
b73ced397f
Use single quotes also in $LINE definiton
2014-02-21 22:16:12 +01:00
b0fbe0d11a
Avoid evaluating special chars in $LINE on title command ( fixes #2234 )
2014-02-21 22:16:12 +01:00
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
b0b79e0aba
No need to eval in rvm_prompt_info!
...
Just activate word-splitting.
2014-01-07 19:08:20 +01:00
85fde31991
Renames the file to prompt_info_functions.zsh
2014-01-06 09:58:40 +01:00
082607c165
Adds documentation.
2014-01-06 09:57:23 +01:00
72392a2c27
Adds all other dummy implementations.
2014-01-06 09:57:09 +01:00
6a40557a8b
Updates spectrum.zsh
2013-12-31 14:54:34 +01:00
c6aacf611d
Refactors ruby_prompts.zsh
2013-12-31 02:45:09 +01:00
8a887c5052
Joins ruby prompt files and adds ruby_prompt_info.
2013-12-31 02:11:02 +01:00
7aa766168c
Adds chruby_prompt_info dummy function.
2013-12-31 01:44:51 +01:00
ae6ded5ad7
Returns false when rbenv is not found.
2013-12-31 01:15:35 +01:00
468b24a8d5
Returns false when rvm is not found.
2013-12-31 01:06:14 +01:00
bbbff94cca
Fixes rvm_prompt_info() in lib/rvm.zsh
2013-12-31 00:35:57 +01:00
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
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
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
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
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
273728901e
Merge pull request #513 from randy909/fix-edit-cmdline
...
Fix edit-command-line binding
2013-12-02 23:03:03 -08:00
fb614a0e80
Merge pull request #2229 from prubianes/master
...
Bazaar Integration Lib
2013-12-02 22:37:28 -08:00
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
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
c9f2c947e4
Added/modified some useful aliases.
2013-11-29 14:25:46 +01:00
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
a7540844d5
Add support for colored ls output on OpenBSD
2013-11-14 07:06:54 -05:00
5c73cb671b
Added nvm.zsh to detect current Node.js version
2013-11-08 23:26:05 +04:00
efc37c1f71
Modification to the frisk theme to work with the BZR lib
2013-11-06 20:10:59 -02:00
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
77cf869605
Add option for show in the command execution time stamp in the history
2013-06-30 20:54:23 +08:00
4f8d6a8b15
Merge pull request #1773 from essembeh/master
...
Uncomment l alias
2013-06-25 09:10:05 -07:00
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
9703eba66e
Fixed slow behavior when using GitHub wrappers
2013-06-12 20:04:08 +03:00
ab7604e5c2
Escape both % and $ in the command line
...
Fixes issue #1884
2013-06-11 11:37:35 -07:00
4ff861ee11
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
2013-05-19 12:55:10 -07:00
f77a545a4b
Uncomment l alias
2013-04-28 16:34:36 +02:00
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
8890df1251
Merge pull request #922 from sbfaulkner/master
...
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
81ed0c4115
Resolving conflict with merge of #970
2013-04-23 20:44:35 -07:00
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
a2c8db9eb3
Resolving conflict in #1266 merge
2013-04-23 20:30:21 -07:00
7cdb6d667c
Resolving conflict when merging in 1570
2013-04-23 20:21:18 -07:00
b61555d7c0
Merge pull request #1582 from To1ne/pushdminus
...
use pushdminus
2013-04-23 20:16:41 -07:00
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
30b0eb3ffa
Merge pull request #1740 from felipec/fc/git
...
git: fix parse_git_dirty()
2013-04-23 19:42:58 -07:00
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
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
085af13b47
Merge pull request #1531 from lcosmin/master
...
Fixed 'ls' issue on NetBSD
2013-04-12 06:16:54 -07:00
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
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
b8b241f630
Merge pull request #749 from blueyed/setopt-correct
...
Only `setopt correct`, not "correct_all".
2013-03-26 22:14:20 -07:00
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
a3a6b91818
Merge pull request #1616 from sxeraverx/master
...
pipe git version check error to /dev/null (for when git doesn't exist)
2013-03-26 21:56:35 -07:00
3826c7bf85
allow setting a custom HISTFILE before oh-my-zsh is loaded
2013-03-15 22:07:47 +01:00
56e835426b
fix git_prompt_status() to not say the repository has untracked files all the time
2013-03-14 00:31:14 +01:00
72ec24108a
Tweaked parse_git_dirty() in lib/git.zsh to support proper dirty/clean parsing against both git 1.6 and git 1.7+
2013-03-11 13:41:32 -06:00
3db22634a1
pipe git version check error to /dev/null (for when git doesn't exist)
2013-02-19 10:00:58 -08:00
fb3dc24ff4
Support for opening tabs and windows in the same This fixed #1498 for me on Mountain Lion
2013-02-14 14:07:58 +05:30
9245a30868
Did a full circle and went back to # On branch master
...
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: git.zsh
#, ignoring untracked files, which seems to be the primary cause for slowness
2013-02-13 17:14:43 +01:00
11576dd40b
Fixed dirty check to include files added to index
2013-02-13 11:28:13 +01:00
2595484a97
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/aliases.zsh
2013-02-08 19:08:06 +01:00
fe4c2379c4
use pushdminus
2013-02-04 22:21:34 +01:00
171a76a3c4
Closer to original status command, using SUBMODULE SYNTAX
2013-01-30 09:32:01 +01:00
2e213b9b8f
Faster dirty git status check (using git diff)
2013-01-27 14:50:33 +01:00
4c91f6d13e
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv into
...
oh-my-zsh.
2013-01-25 13:23:40 +02:00
9ef7e8a191
Merge pull request #1077 from Mezzle/add-option-to-show-git-status
...
Add option to disable status notification
2013-01-10 22:36:16 -08:00
e5736d3910
Fixed coding style
2013-01-03 14:44:17 +02:00
c5ecb4e136
Fixes #1489
...
Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"
This reverts commit 8f89d4d5a5
2012-12-31 05:25:07 -08:00
fa355a798c
Fixed issue with NetBSD's ls
2012-12-31 14:02:22 +02:00
b9a989fea5
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
2012-12-07 10:25:02 +01:00
78e3f38db7
Merge pull request #1258 from caio/git-branch-status
...
Add branch status support to git_prompt_status
2012-12-04 06:56:43 -08:00
5aed0aed4e
Merge pull request #875 from ttddyy/prompt_git-remove
...
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
d88fad3392
Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
...
Fixed Mac OS X Terminal.app related issue with extra newlines echoed
2012-12-04 06:45:01 -08:00
421a738b49
Merge pull request #1273 from ystein/master
...
Typo in cd-wrapper
2012-12-04 06:36:45 -08:00
aa382b572e
Merge pull request #1255 from SuprDewd/master
...
Added a "please" alias for sudo
2012-12-02 12:44:17 -08:00
9977afc0b5
Merge pull request #1263 from tedv/headless-git
...
Make git use sha when branch name is missing.
2012-12-02 12:42:38 -08:00
2e5a689c05
Merge pull request #1265 from aletessier/ssh-completion
...
Fix ssh plugin completion
2012-12-02 12:42:08 -08:00
fe094712fb
resolving conflict in termsupport plugin
2012-12-02 12:30:46 -08:00
b2b77be56f
Merge pull request #1341 from markusscherer/master
...
fix title setting bug in xterm and urxvt
2012-12-02 12:27:04 -08:00
e10552b403
Merge pull request #1354 from F30/master
...
Set the '-R' option for less not in $PAGER, but as $LESS
2012-12-02 12:26:41 -08:00
1417111bad
Merge pull request #1453 from simonoff/master
...
new theme and rvm theming support
2012-12-02 12:20:31 -08:00
11ff3b642d
Removing mcd as it conflicts with mtools
2012-12-02 12:05:58 -08:00
77e4c1c9f1
Merge pull request #253 from loopj/master
...
Added function git_remote_status to lib/git.zsh which extracts if the local branch is ahead/behind/diverged from remote
2012-12-02 11:43:09 -08:00
27841ca7c1
Set default for rvm prompt prefix/suffix
2012-12-02 20:30:25 +02:00
30687c4147
Fix RVM loading and RVM ruby version info
2012-12-02 20:00:11 +02:00
5b2ca3875a
Improved statistics functions, effect:
...
1 1124 24.6006% c
2 985 21.5583% git
3 343 7.50711% rails
4 328 7.17881% cd
5 314 6.8724% rspec
6 257 5.62486% la
7 197 4.31167% rake
8 154 3.37054% s
9 109 2.38564% ..
10 95 2.07923% rvm
11 68 1.48829% guard
12 36 0.787919% bundle
13 29 0.634712% ssh
14 28 0.612826% pry
15 27 0.590939% open
16 26 0.569052% middleman
17 26 0.569052% gem
18 24 0.525279% rm
19 24 0.525279% heroku
20 23 0.503392% nvm
2012-11-14 19:09:13 +08:00
174c9177aa
Replace hardcoded key escape sequeneces with dynamic ones from terminfo.
2012-10-17 16:04:42 +02:00
ff0cafa14d
Make sure the terminal is always in application mode when zle is active.
2012-10-14 00:10:40 +02:00
3839c6e9e6
Don't clobber standard Esc+. behavior
...
Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
Conflicts:
lib/key-bindings.zsh
2012-10-13 23:50:40 +02:00
f7708d4181
forgot to save before committing. doh
2012-10-13 23:44:31 +02:00
68cec79d32
Added documentation to key bindings.
...
Conflicts:
lib/key-bindings.zsh
2012-10-13 23:43:55 +02:00
daa6ecebc1
Set the '-R' option for less not in $PAGER, but as $LESS.
2012-10-13 23:16:39 +02:00
43bd46b780
fix title setting bug in xterm and urxvt
...
Before this patch, commands containing %-signs set the title wrong
(urxvt and xterm) [1] and produce strange output in urxvt [2].
test for bug 1:
> sleep 10 && echo %
sets title to "sleep 10 && echo %<<"
> sleep 10 && echo %f
doesn't change the title at all
test for bug 2 (only urxvt):
> echo %f
39m%f
^^^^^----- output
2012-10-03 17:18:14 +02:00
a7fb668078
Make rvm prompt function a bit cleaner
2012-09-26 13:57:38 -07:00
3d1b788d8a
Fixing the rvm_prompt_info command, now it will not show empty parens if no rvm is currently being used
2012-09-26 13:56:37 -07:00
9172b3a89f
fix typo in cd-wrapper
2012-08-05 22:51:11 +03:00
9af7f86299
Correct variable used for global ssh known host completion
2012-08-01 23:58:09 +02:00
027fcccc92
Make git use sha when branch name is missing.
2012-07-31 13:27:40 -04:00
a3c2a2f6e8
Add branch status support to git_prompt_status
...
This patch makes git_prompt_status support three new status variables:
- ZSH_THEME_GIT_PROMPT_AHEAD
- ZSH_THEME_GIT_PROMPT_BEHIND
- ZSH_THEME_GIT_PROMPT_DIVERGED
With these extra variables it's easy to see (1) if you have commits in
your local branch that weren't pushed to the remote (AHEAD), (2) if
there are commits in the remote that you haven't merged/rebased yet
(BEHIND) or (3) if you have local unpushed commits AND the remote has
some commits you haven't merged yet (DIVERGED).
Refer to the first line displayed on `git status -b --porcelain`.
An example setup in a .zsh-theme file would be:
ZSH_THEME_GIT_PROMPT_AHEAD="↑"
ZSH_THEME_GIT_PROMPT_BEHIND="↓"
ZSH_THEME_GIT_PROMPT_DIVERGED="↕"
2012-07-29 20:18:26 +02:00
682961e930
Add a configuration option to disable autocorrect
2012-07-28 08:25:15 +10:00
75029cda2a
Added a "please" alias for sudo
2012-07-26 17:54:15 +00:00
772bc51c3a
Merge
2012-07-24 13:39:07 -07:00
8d23a36110
Merge branch 'master' of github.com:essembeh/oh-my-zsh
2012-06-27 00:12:55 +02:00
18cb11903f
Comment l alias
2012-06-27 00:12:21 +02:00
29fb24487c
Merge remote-tracking branch 'upstream/master'
2012-06-25 17:41:06 +02:00
4f9cfee9bd
avoid VCS folders
2012-06-14 08:06:36 +03:00
e8d582aba9
Merge pull request #977 from scialex/better-d
...
Make the 'd' alias only show the directories that can be cd'd to using the number aliases.
2012-06-13 13:25:00 -07:00
38d537f9e7
Merge pull request #984 from vmalloc/less_r_pager
...
Pager is 'less -R' to support colored outputs
2012-06-13 13:22:33 -07:00
f60244f8f4
Merge pull request #999 from ChaosData/master
...
Auto title now disabled in emacs term mode
2012-06-13 13:20:42 -07:00
e6c81a5893
Merge pull request #1019 from matschaffer/patch-1
...
Don't clobber standard Esc+. behavior
2012-06-13 13:09:45 -07:00
1bb715965c
Change hardcoded ~/.oh-my-zsh to $ZSH.
2012-06-12 10:18:02 +02:00
8f71efc09b
Add helper to easily define default values for variables and env variables.
2012-05-29 01:51:50 +02:00
dbef8b1a92
Add helper to get the value of an alias only
2012-05-29 01:49:52 +02:00
8ce35df2c5
Add option to disable status notification
...
For certain git repositories, this slows down usage
of the shell horifically.
This option can be set with
git config --add oh-my-zsh.hide-status 1
which will disable checking/showing the status notification
2012-04-18 11:45:22 +01:00
741388be00
Merge remote branch 'upstream/master'
...
Conflicts:
lib/completion.zsh
2012-04-12 19:28:59 +02:00
5f72c63136
Don't clobber standard Esc+. behavior
...
Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
2012-03-17 22:03:01 -03:00
c7105a5341
Disabled title function for emacs term mode
2012-03-07 07:47:34 -05:00
19bf83e17d
Pager is 'less -R' to support colored outputs
2012-03-01 10:27:19 +02:00
d693711f14
made the 'd' alias only show the directories that can be cd'ed to using the number aliases
2012-02-28 13:52:57 -05:00
4e0b5be145
Fix spurious correction with sudo vim
...
user@host:~ $ sudo vim /etc/rc.conf
zsh: correct 'vim' to '.vim' [nyae]?
http://www.zsh.org/mla/users/2012/msg00028.html
2012-02-23 23:12:07 -08:00
5a5c93b334
Fixed bug introduced when fixing issue 896
2012-02-21 10:47:05 -05:00
a9f6aed307
fixed introduced to parse_git_dirty
2012-02-08 15:30:58 -05:00
7ea758834b
changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
2012-02-08 15:25:12 -05:00
dc4d7a92c1
fixed asterisk display for modified repos in git prior to 1.7.2
2012-02-08 15:19:12 -05:00
fbf5b0ecb6
add default rbenv_prompt_info implementation to close #878
2012-02-06 21:50:17 -05:00
8f89d4d5a5
Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes
2012-01-27 01:20:06 -07:00
8769e5f8c9
Removed trailing spaces in Git files. Fixes #867
2012-01-26 23:19:50 -08:00
52733cb3bb
prompt git-remove as deleted
2012-01-26 15:20:08 -08:00
cb501645d7
Get the Hostname
...
Main library should use ZSH native hostname function
2011-12-30 12:11:41 -06:00
b29602e661
Merge pull request #764 from Fl4t/submodules
...
Ignore submodules dirty in prompt info
2011-12-26 10:05:51 -08:00
2b86624951
Merge pull request #772 from indrajitr/master
...
Fix upgrade and uninstall functions to pick up $ZSH value
2011-12-26 10:04:59 -08:00
0b583638ae
Fix upgrade and uninstall functions to pick up $ZSH value
2011-12-25 19:53:55 +05:30
d8521693f4
Added support for entries in /etc/ssh/ssh_known_hosts.
2011-12-22 14:02:01 -05:00
dd14e075b7
Ignore submodules dirty in prompt info
2011-12-21 15:03:55 +01:00
98578ec241
`setopt append_history` is not necessary.
...
Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.
2011-12-16 14:21:45 +01:00
70e51186ec
Only `setopt correct`, not "correct_all".
...
Using the correct_all option is too distracting, and needs a lot of
`nocorrect` aliases to work around this.
Using only "correct" to correct the command itself is more friendly.
2011-12-16 14:01:59 +01:00
3726611275
Merge remote branch 'upstream/master'
2011-12-15 16:15:23 +01:00
d1b6423f2f
Merge pull request #732 from ggustafsson/patch-1
...
Removed duplicate setting and sorted the remaining
2011-12-14 21:59:37 -08:00
3fc812afc9
Removed duplicate setting and sorted the remaining
2011-12-03 13:18:37 +01:00
40c47a7375
lib/termsupport now uses add-zsh-hook
...
This is needed to play nice with plugins that need various hooks.
2011-11-15 01:14:03 -05:00
c4434d2dde
Update completion for SSH
...
Add all hosts found in ~/.ssh/config.
Tip found on: http://www.nerux.org/wiki/OpenSSH#coupler_avec_zsh_completion
2011-11-05 00:34:37 +01:00
762b55bb2b
Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506
...
Add key bindings for gnome-terminal on Fedora
2011-08-30 21:09:36 -07:00
9d67d75b0a
Revert "Enable red dots during completion by default".
...
After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.
This reverts commit fc49b4a4de
2011-08-30 20:56:13 -07:00
be2ab22694
Merge pull request #492 from hwti/red-dots-completion
...
Display red dots during completion process (disabled by default)
2011-08-11 05:51:03 -07:00
f20cfc68e8
Fix edit-command-line binding
...
This binding doesn't work when the edit-command-line.zsh file is loaded
after the key-bindings.zsh file because 'bindkey -e' in key-bindings.zsh
resets the binding. Moving the bindings to they key-bindings.zsh file
and removing edit-command-line.zsh.
2011-08-01 13:06:52 -05:00
0ba398f9e1
Merge in recent stuff
2011-08-01 00:44:51 -07:00
a738ca9b64
Merge pull request #464 from bkonkle/patch-1
...
Minor corrections to deletion detection in git_prompt_status
2011-07-30 18:08:54 -07:00
fc49b4a4de
Enable red dots during completion by default
2011-07-28 19:52:53 +02:00
0848acfb25
Display red dots during completion process (disabled by default)
2011-07-24 21:48:21 +02:00
428f18cf42
Add key bindings for gnome-terminal on Fedora
2011-07-23 23:09:03 +02:00
46440e7198
Merge pull request #208 from sorin-ionescu/plugin-extract
...
extract plugin
2011-07-23 09:33:42 -07:00
5e4d89385f
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
2011-07-23 09:13:57 -07:00
eb63ddf6bb
added mac keybinding for backward-delete-char
2011-07-23 09:11:08 -07:00
ae9457d84d
Merge pull request #487 from dreur/upstream-spectrum-utility
...
Add utility method to spectrum
2011-07-23 08:58:10 -07:00
34f00f385c
More generic.
2011-07-23 08:54:47 -07:00
cbaa97d8c3
Add utility method to spectrum
2011-07-23 11:09:45 -04:00
a38774c98d
C-x C-e to edit current command in EDITOR
...
The command C-x C-e opens the current command line for editing
in the editor defined by the $EDITOR environment variable.
Thanks to Craig Bosma and his blog post about this:
http://distrustsimplicity.net/articles/zsh-command-editing
2011-07-18 09:54:59 -04:00
6774fb3d59
Minor corrections to deletion detection in git_prompt_status
2011-07-13 23:23:01 -07:00
25adbe81a5
Aliases
...
Modify directory listing aliases to make more sense. Remove conflicting helper
function (mcd conflicts with mtools).
2011-06-05 08:08:58 -04:00
1db6575f14
Added extract plugin.
2011-06-01 20:33:16 -04:00
c014dca141
Fix deleted in git.zsh
2011-05-31 15:59:38 -07:00
a81b0171cc
Merge pull request #196 from asymmetric/master
...
Add missing flag to unrar
2011-05-26 01:13:18 -07:00
d275440219
Merge pull request #290 from arthurkalm/delete-key-working
...
Make the delete key work correctly, instead of outputting a ~
2011-05-13 02:52:25 -07:00
4f71818a8b
Merge pull request #329 from juanghurtado/master
...
Support for $(current_branch) on git_parse_ahead()
2011-05-13 02:48:50 -07:00
e129fc5a28
Adds support for $(current_branch) on git_parse_ahead()
...
Changes method git_parse_ahead() on git.zsh lib file. Before this
change it checked directly against origin/master branch. Now it
uses $(current_branch) to check for not pushed changes against
the current remote branch.
2011-05-09 13:32:42 +02:00
e3cede37a0
Relax pattern matching on TERM. Closes #320 .
2011-05-02 13:51:16 +02:00
077baa7bb1
Adds new prompt methods on Git lib
...
Modifies the Git lib file (lib/git.zsh), adding three new prompt
methods:
- git_prompt_ahead(): Shows the content of the custom var
$ZSH_THEME_GIT_PROMPT_AHEAD if the local repository has
commits ahead from the remote origin repository
- git_prompt_short_sha(): Shows last commit SHA hash in short
mode wrapped between the content of the custom vars
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
$ZSH_THEME_GIT_PROMPT_SHA_AFTER
- git_prompt_long_sha(): Shows last commit SHA hash in long
mode wrapped between the content of the custom vars
$ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
$ZSH_THEME_GIT_PROMPT_SHA_AFTER
2011-04-29 09:22:56 +02:00
655e6e8df0
Merge remote branch 'upstream/master'
...
Conflicts:
plugins/github/github.plugin.zsh
2011-04-20 01:29:58 -04:00
7d9628b2dc
Added bindings for Gnome terminal.
2011-04-19 22:40:46 -04:00
c7c959de60
Make the delete key work correctly, instead of outputting a ~
2011-04-19 19:01:18 -04:00
16ac094a43
Moved compinit call back to oh-my-zsh.sh, after plugins are loaded
2011-04-12 09:28:15 -04:00
8883ace767
Revert "Enable alias completion, do not limit completion to just files"
...
This reverts commit c3a58b0004
2011-04-12 10:24:06 +02:00
ef4175981b
Moved the single compinit call from oh-my-zsh.sh to lib/completion.zsh
2011-04-08 11:10:14 -04:00
993e05da50
Replace redundant calls to compinit with a single call.
2011-04-08 10:12:22 -04:00
0cc0915bf8
Refactor DISABLE_AUTO_TITLE to be more DRY
2011-04-04 14:02:50 +02:00
a3e92892bb
Command title behavior no longer depend on local zsh configuration
...
Fix by derekjw. closes #52 .
2011-04-04 13:56:00 +02:00
d138751cbd
Escape characters used in escape sequence to avoid triggering bugs in Apple Terminal
...
Closes #45 #57 #58 #86 .
2011-04-04 13:49:02 +02:00
06063ab695
Introduce DISABLE_AUTO_TITLE option
2011-03-23 21:20:08 -07:00
2d5412e99b
Added new function git_remote_status to check if we are ahead, behind or diverged from the remote branch
2011-03-19 17:50:24 -07:00
52df85440e
Revert "Re-order title/tab setting to make window titles work on OSX terminal which"
...
Was causing iTerm title to disappear entirely..
This reverts commit d4ea399b04
2011-03-16 12:20:35 -07:00
fce2733fe9
Merge branch 'osx-terminal-title' of https://github.com/curiousstranger/oh-my-zsh into curiousstranger-osx-terminal-title
2011-03-16 08:01:29 -07:00
d4ea399b04
Re-order title/tab setting to make window titles work on OSX terminal which
...
doesn't support tabs titles.
2011-03-13 17:11:32 -06:00
c3a58b0004
Enable alias completion, do not limit completion to just files
2011-03-11 21:44:12 -06:00
4ef3bb4847
Merge branch 'refactor-term' of https://github.com/nel/oh-my-zsh into nel-refactor-term
2011-02-21 22:00:05 -08:00
6a3f406468
Merge branch 'lib-git' of https://github.com/sorin-ionescu/oh-my-zsh into sorin-ionescu-lib-git
2011-02-21 21:50:36 -08:00
452eeed890
Merge branch 'nicoulaj-theme' of https://github.com/nicoulaj/oh-my-zsh into nicoulaj-nicoulaj-theme
2011-02-21 21:45:00 -08:00
90a9a5f251
Added modified while newly added and type change detection to git prompt modified status.
2011-02-03 23:24:33 -05:00
faac3ba8fc
Refactor window and tab title in tty
...
Term window title and tab title are now skinable
Tab title can be different from window title (when supported by term)
Default theme is optimized of usuability (no %u@%m: $~ in a 10 char tab)
Cleanup code duplication and add comment for supported terms
On osX it works great on iterm, and is decent once you tweak Terminal pref
Tested under GNU screen, iTerm and Apple Terminal, need to be tested on linux
TODO implement Konsole support (via dbus)
2011-01-30 09:19:47 +01:00
fcc7801435
add missing unrar flag
2011-01-24 15:49:49 +01:00
f02e732543
Merge branch 'master' of https://github.com/SuprDewd/oh-my-zsh into SuprDewd-master
2011-01-15 01:17:29 -08:00
beb980d370
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh
2011-01-10 17:56:38 +00:00
bcc235e142
Added an option to remove file afterwards.
2011-01-10 17:49:53 +00:00
8294cf44d1
Postponing sourcing of the theme until after local customizations
2011-01-08 23:34:47 -05:00
f0136f2aec
Support for more archive formats.
2010-12-25 13:28:16 +00:00
ff0b25b745
Added a function to extract various archives.
...
Also an alias for the function.
2010-12-24 22:20:57 +00:00
2b03b95122
Added function to mkdir and immediately change to it
2010-12-21 14:28:40 -05:00
f624889aa4
Rename appearance.zsh so that it gets loaded after spectrum.zsh.
...
Allows to use 256 colors in prompt themes.
2010-11-20 18:06:23 +01:00
9465ba0de4
Completion fixes
...
Use /etc/hosts in addtion to $HOME/.ssh/known_hosts as the source for
hostname completion
Turn on completion caching to speed up certain comands
When completing usernames, don't include system accounts by default
2010-11-03 16:57:15 -04:00
dc12853b0c
merging in changes from robby's repo
2010-10-09 19:11:07 +01:00
7ab4d30fe1
Merge branch 'title-fix' of http://github.com/philips/oh-my-zsh into philips-title-fix
2010-10-09 09:55:52 -07:00
aab235f612
functions: fix title() to not match any $TERM
...
On my linux virtual terminals, where TERM="linux", I was getting
annoying output that was messing up my prompt.
It turns out the title function was always matching on the elif
statement for xterm/rxvt no matter what and the linux vt doesn't know
what to do with the title special control sequence and thus was printing
out garbage.
Through experimentation I figured out that the || inside of the [[ ]]
did not work:
export TERM=linux
$ if [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then echo $TERM; fi
linux
$ if [[ $TERM =~ "^xterm" ]] || [[ $TERM == "rxvt" ]]; then echo $TERM; fi
Signed-off-by: Brandon Philips <brandon@ifup.org>
openSUSE running zsh 4.3.10
2010-10-08 22:55:09 -07:00
8059c0727a
Improving git plugin so it can display much more data.
2010-10-09 01:48:23 +02:00
b905630366
Match xterm-color, the default OS X terminal
2010-09-30 21:00:38 -07:00
36c05fbe8d
Merge branch 'named_dirs_completion' of http://github.com/kremso/oh-my-zsh into kremso-named_dirs_completion
2010-09-30 20:50:00 -07:00
6104e59c8d
Merge branch 'shifttab' of http://github.com/kremso/oh-my-zsh into kremso-shifttab
2010-09-30 20:48:10 -07:00
74b2c5d75a
Do not complete named-directories
2010-09-26 18:29:14 +02:00
99f159e0a7
Removing '.' alias as it is overwriting a bash/zsh feature. Closes #63
2010-08-24 11:08:20 -07:00
6efc79c74e
Don't correct hpodder commands.
2010-06-05 23:23:53 +08:00
f9fbd07983
Don't display dotfiles or reverse sort with ll alias.
...
The ll alias is a very common default for bash in Linux distributions, so use
that definition.
2010-06-05 23:22:57 +08:00
edc8e3d092
Ignore commands that start with a space.
...
This is useful when you want to use a dangerous command, as it won't be
available with history searching.
2010-06-05 23:22:57 +08:00
6774490a46
Don't auto-correct ebuild commands.
...
It breaks "ebuild <foo> manifest", as there are Manifest files in the directory.
2010-06-05 23:22:57 +08:00
27904c117c
Moving current_branch() to git plugin
2010-06-03 12:56:11 -07:00
89bd2bf317
Moving some rails and osx-specific functions to their corresponding plugin files
2010-06-03 12:55:07 -07:00
455669e976
Removing legacy completion code
2010-06-03 12:54:40 -07:00
ab2c0744ab
Removing rake completion from lib/ as it was moved to rails plugin
2010-06-03 12:33:15 -07:00
3cf9ab722e
Initial implementation of a new plugin system, so that people can managed which aliases/functions they want.
2010-06-03 12:03:26 -07:00
ba9c78fc9b
Import rvm prompt
2010-05-28 08:13:17 +08:00
93f9825b79
share history with your zsh's on the same host
2010-05-08 04:23:50 +08:00
9efc086fb3
two aliases set to 'ss', clobbering rails script/server
2010-05-08 04:22:34 +08:00
7a9d4ceb75
Merge remote branch 'jreese/master'
2010-05-07 13:16:50 -07:00
926d9e8893
Don't autoselect first completion entry ( Fixes #14 )
...
The key here is not using MENU_COMPLETE which autoselects the first
entry, but using AUTO_MENU which displays the menu but autoselects
on successive tab hit.
Also, do not use zstyle menu yes because that somehow overrides
the setopts.
2010-05-06 21:06:58 -07:00
447da5816e
Removing rake autocompletion as this is apparently baked into recent versions of zsh
2010-05-06 21:04:09 -07:00
e8ef16570f
escape sequences so rprompt doesn't mess up
2010-05-06 20:46:32 -07:00
02bd8ab53e
Added scpectrum script for easy 256 color theaming
2010-05-06 20:46:32 -07:00
LFDM