leo/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-09-21 15:30:09 +00:00
Code Releases Activity
4900 commits 1 branch 0 tags 138 MiB
Commit graph

504 commits

Author SHA1 Message Date
Andrew Janke 4fc6dccb42 term: Move DISABLE_AUTO_TITLE check to hooks 
Move the DISABLE_AUTO_TITLE check from title() to the preX hook
functions that call it, to allow the title() function to be used
directly by user or other callers.
 2015-02-10 19:38:11 +01:00
Marc Cornellà 2193135ebc Clean up appearance lib file and redundant colors calls in other files 2015-02-10 19:22:50 +01:00
Marc Cornellà 51946eb3ce Implement deletion of sl alias as per #3055 2015-02-10 19:22:39 +01:00
LFDM 4b4292a496 Fix a typo 2015-02-10 19:22:39 +01:00
LFDM 83c4e06206 Moves a bindkey call from misc to key-bindings. 2015-02-10 19:22:39 +01:00
LFDM 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
LFDM 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
LFDM 25b1cd687b Brings all directory stuff to directories.zsh 
- Cleans out aliases.zsh.
- Removes unneeded cd function.
 2015-02-10 19:22:38 +01:00
Robby Russell 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
Andrew Janke be7028012e Reword comments on termsupport internal functions. 2015-02-04 01:00:51 -05:00
The Linux Kitten f2130fa1a3 Test if --color=auto is a valid option for grep 2015-02-02 20:49:24 +01:00
Robby Russell 550ccca91c Merge pull request #3478 from stephenrjohnson/custom_cache_dir 
Allow custom cache dir
 2015-01-31 06:23:50 -06:00
Andrew Janke 5f79ab5547 Move chpwd update output from chpwd hook to precmd to avoid 
contaminating script/function output
 2015-01-27 21:00:07 -06:00
Stephen 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
Andrew Janke 7295e38885 termsupport: add chpwd hook for setting pwd in Apple Terminal.app 2014-12-21 15:05:22 -05:00
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
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
drm00 f516b7c7f5 add check for colored ls on openbsd. (retry of #2225) 2014-04-25 14:15:14 +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
Robby Russell 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
Flavius Aspra 3826c7bf85 allow setting a custom HISTFILE before oh-my-zsh is loaded 2013-03-15 22:07:47 +01:00
Philip Stark 56e835426b fix git_prompt_status() to not say the repository has untracked files all the time 2013-03-14 00:31:14 +01:00
bertag 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
Thomas Minor 3db22634a1 pipe git version check error to /dev/null (for when git doesn't exist) 2013-02-19 10:00:58 -08:00
Swanand Pagnis 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
Yoav Weiss 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
Yoav Weiss 11576dd40b Fixed dirty check to include files added to index 2013-02-13 11:28:13 +01:00
Sébastien M-B 2595484a97 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	lib/aliases.zsh
 2013-02-08 19:08:06 +01:00
Toon Claes fe4c2379c4 use pushdminus 2013-02-04 22:21:34 +01:00
Yoav Weiss 171a76a3c4 Closer to original status command, using SUBMODULE SYNTAX 2013-01-30 09:32:01 +01:00
Yoav Weiss 2e213b9b8f Faster dirty git status check (using git diff) 2013-01-27 14:50:33 +01:00
Serdar Dalgıç 4c91f6d13e Add autoenv plugin, which adopts using Kenneth Reitz's autoenv into 
oh-my-zsh.
 2013-01-25 13:23:40 +02:00
Robby Russell 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
Cosmin Lu?ă e5736d3910 Fixed coding style 2013-01-03 14:44:17 +02:00
Robby Russell 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
Cosmin Lu?ă fa355a798c Fixed issue with NetBSD's ls 2012-12-31 14:02:22 +02:00
MAD 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
Robby Russell 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
Robby Russell 5aed0aed4e Merge pull request #875 from ttddyy/prompt_git-remove 
prompt git-rm as deleted
 2012-12-04 06:45:17 -08:00
Robby Russell 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
Robby Russell 421a738b49 Merge pull request #1273 from ystein/master 
Typo in cd-wrapper
 2012-12-04 06:36:45 -08:00
Robby Russell aa382b572e Merge pull request #1255 from SuprDewd/master 
Added a "please" alias for sudo
 2012-12-02 12:44:17 -08:00
Robby Russell 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
Robby Russell 2e5a689c05 Merge pull request #1265 from aletessier/ssh-completion 
Fix ssh plugin completion
 2012-12-02 12:42:08 -08:00
Trae Robrock fe094712fb resolving conflict in termsupport plugin 2012-12-02 12:30:46 -08:00
Robby Russell b2b77be56f Merge pull request #1341 from markusscherer/master 
fix title setting bug in xterm and urxvt
 2012-12-02 12:27:04 -08:00
Robby Russell 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
Robby Russell 1417111bad Merge pull request #1453 from simonoff/master 
new theme and rvm theming support
 2012-12-02 12:20:31 -08:00
Robby Russell 11ff3b642d Removing mcd as it conflicts with mtools 2012-12-02 12:05:58 -08:00
Robby Russell 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
Alexander Simonov 27841ca7c1 Set default for rvm prompt prefix/suffix 2012-12-02 20:30:25 +02:00
Alexander Simonov 30687c4147 Fix RVM loading and RVM ruby version info 2012-12-02 20:00:11 +02:00
CHH 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
Felix Dreissig 174c9177aa Replace hardcoded key escape sequeneces with dynamic ones from terminfo. 2012-10-17 16:04:42 +02:00
Felix Dreissig ff0cafa14d Make sure the terminal is always in application mode when zle is active. 2012-10-14 00:10:40 +02:00
Mat Schaffer 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
Kyle West f7708d4181 forgot to save before committing. doh 2012-10-13 23:44:31 +02:00
Kyle West 68cec79d32 Added documentation to key bindings. 
Conflicts:
	lib/key-bindings.zsh
 2012-10-13 23:43:55 +02:00
Felix Dreissig daa6ecebc1 Set the '-R' option for less not in $PAGER, but as $LESS. 2012-10-13 23:16:39 +02:00
Markus Scherer 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
Trae Robrock a7fb668078 Make rvm prompt function a bit cleaner 2012-09-26 13:57:38 -07:00
Trae Robrock 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
Yannik Stein 9172b3a89f fix typo in cd-wrapper 2012-08-05 22:51:11 +03:00
Alexis Letessier 9af7f86299 Correct variable used for global ssh known host completion 2012-08-01 23:58:09 +02:00
Ted Vessenes 027fcccc92 Make git use sha when branch name is missing. 2012-07-31 13:27:40 -04:00
Caio Romão 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
Morgan Larosa 682961e930 Add a configuration option to disable autocorrect 2012-07-28 08:25:15 +10:00
Bjarki Ágúst Guðmundsson 75029cda2a Added a "please" alias for sudo 2012-07-26 17:54:15 +00:00
James Smith 772bc51c3a Merge 2012-07-24 13:39:07 -07:00
Sébastien M-B 8d23a36110 Merge branch 'master' of github.com:essembeh/oh-my-zsh 2012-06-27 00:12:55 +02:00
Sébastien M-B 18cb11903f Comment l alias 2012-06-27 00:12:21 +02:00
Sébastien 29fb24487c Merge remote-tracking branch 'upstream/master' 2012-06-25 17:41:06 +02:00
nXqd 4f9cfee9bd avoid VCS folders 2012-06-14 08:06:36 +03:00
Robby Russell 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
Robby Russell 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
Robby Russell f60244f8f4 Merge pull request #999 from ChaosData/master 
Auto title now disabled in emacs term mode
 2012-06-13 13:20:42 -07:00
Robby Russell e6c81a5893 Merge pull request #1019 from matschaffer/patch-1 
Don't clobber standard Esc+. behavior
 2012-06-13 13:09:45 -07:00
s3 1bb715965c Change hardcoded ~/.oh-my-zsh to $ZSH. 2012-06-12 10:18:02 +02:00
mapc 8f71efc09b Add helper to easily define default values for variables and env variables. 2012-05-29 01:51:50 +02:00
mapc dbef8b1a92 Add helper to get the value of an alias only 2012-05-29 01:49:52 +02:00
Martin Meredith 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
Sébastien M-B 741388be00 Merge remote branch 'upstream/master' 
Conflicts:
	lib/completion.zsh
 2012-04-12 19:28:59 +02:00
Mat Schaffer 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
Jeffrey Dileo c7105a5341 Disabled title function for emacs term mode 2012-03-07 07:47:34 -05:00
Rotem Yaari 19bf83e17d Pager is 'less -R' to support colored outputs 2012-03-01 10:27:19 +02:00
Alex Light 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
Andrew Ash 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