1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-23 04:41:57 +00:00
Commit graph

527 commits

Author SHA1 Message Date
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
cruser42
5a5c93b334 Fixed bug introduced when fixing issue 896 2012-02-21 10:47:05 -05:00
Aleksey Orekhov
a9f6aed307 fixed introduced to parse_git_dirty 2012-02-08 15:30:58 -05:00
Aleksey Orekhov
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
Aleksey Orekhov
dc4d7a92c1 fixed asterisk display for modified repos in git prior to 1.7.2 2012-02-08 15:19:12 -05:00
Brent Faulkner
fbf5b0ecb6 add default rbenv_prompt_info implementation to close #878 2012-02-06 21:50:17 -05:00
Darren Clark
8f89d4d5a5 Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes 2012-01-27 01:20:06 -07:00
Carlos Rodriguez
8769e5f8c9 Removed trailing spaces in Git files. Fixes #867 2012-01-26 23:19:50 -08:00
Tadaya Tsuyukubo
52733cb3bb prompt git-remove as deleted 2012-01-26 15:20:08 -08:00
Gustavo Barron
cb501645d7 Get the Hostname
Main library should use ZSH native hostname function
2011-12-30 12:11:41 -06:00
Robby Russell
b29602e661 Merge pull request #764 from Fl4t/submodules
Ignore submodules dirty in prompt info
2011-12-26 10:05:51 -08:00
Robby Russell
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
Indrajit Raychaudhuri
0b583638ae Fix upgrade and uninstall functions to pick up $ZSH value 2011-12-25 19:53:55 +05:30
Kyle Smith
d8521693f4 Added support for entries in /etc/ssh/ssh_known_hosts. 2011-12-22 14:02:01 -05:00
julien@macbook
dd14e075b7 Ignore submodules dirty in prompt info 2011-12-21 15:03:55 +01:00
Daniel Hahler
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
Daniel Hahler
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
Sébastien M-B
3726611275 Merge remote branch 'upstream/master' 2011-12-15 16:15:23 +01:00
Robby Russell
d1b6423f2f Merge pull request #732 from ggustafsson/patch-1
Removed duplicate setting and sorted the remaining
2011-12-14 21:59:37 -08:00
Göran Gustafsson
3fc812afc9 Removed duplicate setting and sorted the remaining 2011-12-03 13:18:37 +01:00
Christian Höltje
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
Sébastien M-B
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
Robby Russell
762b55bb2b Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506
Add key bindings for gnome-terminal on Fedora
2011-08-30 21:09:36 -07:00
Robby Russell
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
Robby Russell
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
Randy Hancock
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
James Smith
0ba398f9e1 Merge in recent stuff 2011-08-01 00:44:51 -07:00
Robby Russell
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
Loïc Yhuel
fc49b4a4de Enable red dots during completion by default 2011-07-28 19:52:53 +02:00
Loïc Yhuel
0848acfb25 Display red dots during completion process (disabled by default) 2011-07-24 21:48:21 +02:00
Loïc Yhuel
428f18cf42 Add key bindings for gnome-terminal on Fedora 2011-07-23 23:09:03 +02:00
Robby Russell
46440e7198 Merge pull request #208 from sorin-ionescu/plugin-extract
extract plugin
2011-07-23 09:33:42 -07:00
Robby Russell
5e4d89385f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-07-23 09:13:57 -07:00
Sven Lito
eb63ddf6bb added mac keybinding for backward-delete-char 2011-07-23 09:11:08 -07:00
Robby Russell
ae9457d84d Merge pull request #487 from dreur/upstream-spectrum-utility
Add utility method to spectrum
2011-07-23 08:58:10 -07:00
hobbestigrou
34f00f385c More generic. 2011-07-23 08:54:47 -07:00
Benjamin Boudreau
cbaa97d8c3 Add utility method to spectrum 2011-07-23 11:09:45 -04:00
Christopher Sexton
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
Brandon Konkle
6774fb3d59 Minor corrections to deletion detection in git_prompt_status 2011-07-13 23:23:01 -07:00
Andrew Hodges
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
Sorin Ionescu
1db6575f14 Added extract plugin. 2011-06-01 20:33:16 -04:00
Michael Hanson
c014dca141 Fix deleted in git.zsh 2011-05-31 15:59:38 -07:00
Robby Russell
a81b0171cc Merge pull request #196 from asymmetric/master
Add missing flag to unrar
2011-05-26 01:13:18 -07:00
Robby Russell
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
Robby Russell
4f71818a8b Merge pull request #329 from juanghurtado/master
Support for $(current_branch) on git_parse_ahead()
2011-05-13 02:48:50 -07:00
Juan G. Hurtado
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
Renaud (Nel) Morvan
e3cede37a0 Relax pattern matching on TERM. Closes #320. 2011-05-02 13:51:16 +02:00
Juan G. Hurtado
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
Pat Regan
655e6e8df0 Merge remote branch 'upstream/master'
Conflicts:
	plugins/github/github.plugin.zsh
2011-04-20 01:29:58 -04:00
Arthur Kalmenson
7d9628b2dc Added bindings for Gnome terminal. 2011-04-19 22:40:46 -04:00
Arthur Kalmenson
c7c959de60 Make the delete key work correctly, instead of outputting a ~ 2011-04-19 19:01:18 -04:00
Pat Regan
16ac094a43 Moved compinit call back to oh-my-zsh.sh, after plugins are loaded 2011-04-12 09:28:15 -04:00
Robby Russell
8883ace767 Revert "Enable alias completion, do not limit completion to just files"
This reverts commit c3a58b0004.
2011-04-12 10:24:06 +02:00
Pat Regan
ef4175981b Moved the single compinit call from oh-my-zsh.sh to lib/completion.zsh 2011-04-08 11:10:14 -04:00
Pat Regan
993e05da50 Replace redundant calls to compinit with a single call. 2011-04-08 10:12:22 -04:00
Renaud (Nel) Morvan
0cc0915bf8 Refactor DISABLE_AUTO_TITLE to be more DRY 2011-04-04 14:02:50 +02:00
Renaud (Nel) Morvan
a3e92892bb Command title behavior no longer depend on local zsh configuration
Fix by derekjw. closes #52.
2011-04-04 13:56:00 +02:00
Renaud (Nel) Morvan
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
Lorrin Nelson
06063ab695 Introduce DISABLE_AUTO_TITLE option 2011-03-23 21:20:08 -07:00
James Smith
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
Robby Russell
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
Robby Russell
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
Matt Cable
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
Woody Gilk
c3a58b0004 Enable alias completion, do not limit completion to just files 2011-03-11 21:44:12 -06:00
Robby Russell
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
Robby Russell
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
Robby Russell
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
Sorin Ionescu
90a9a5f251 Added modified while newly added and type change detection to git prompt modified status. 2011-02-03 23:24:33 -05:00
Renaud (Nel) Morvan
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
Lorenzo Manacorda
fcc7801435 add missing unrar flag 2011-01-24 15:49:49 +01:00
Robby Russell
f02e732543 Merge branch 'master' of https://github.com/SuprDewd/oh-my-zsh into SuprDewd-master 2011-01-15 01:17:29 -08:00
SuprDewd
beb980d370 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2011-01-10 17:56:38 +00:00
Robin Ramael
bcc235e142 Added an option to remove file afterwards. 2011-01-10 17:49:53 +00:00
Michael Komitee
8294cf44d1 Postponing sourcing of the theme until after local customizations 2011-01-08 23:34:47 -05:00
SuprDewd
f0136f2aec Support for more archive formats. 2010-12-25 13:28:16 +00:00
SuprDewd
ff0b25b745 Added a function to extract various archives.
Also an alias for the function.
2010-12-24 22:20:57 +00:00
Derek Prior
2b03b95122 Added function to mkdir and immediately change to it 2010-12-21 14:28:40 -05:00
Julien Nicoulaud
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
gwjo
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
Sven Lito
dc12853b0c merging in changes from robby's repo 2010-10-09 19:11:07 +01:00
Robby Russell
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
Brandon Philips
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
Irakli Gozalishvili
8059c0727a Improving git plugin so it can display much more data. 2010-10-09 01:48:23 +02:00
Trevor Creech
b905630366 Match xterm-color, the default OS X terminal 2010-09-30 21:00:38 -07:00
Robby Russell
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
Robby Russell
6104e59c8d Merge branch 'shifttab' of http://github.com/kremso/oh-my-zsh into kremso-shifttab 2010-09-30 20:48:10 -07:00
Tomas Kramar
74b2c5d75a Do not complete named-directories 2010-09-26 18:29:14 +02:00
Robby Russell
99f159e0a7 Removing '.' alias as it is overwriting a bash/zsh feature. Closes #63 2010-08-24 11:08:20 -07:00
James Rowe
6efc79c74e Don't correct hpodder commands. 2010-06-05 23:23:53 +08:00
James Rowe
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
James Rowe
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
James Rowe
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
Robby Russell
27904c117c Moving current_branch() to git plugin 2010-06-03 12:56:11 -07:00
Robby Russell
89bd2bf317 Moving some rails and osx-specific functions to their corresponding plugin files 2010-06-03 12:55:07 -07:00
Robby Russell
455669e976 Removing legacy completion code 2010-06-03 12:54:40 -07:00
Robby Russell
ab2c0744ab Removing rake completion from lib/ as it was moved to rails plugin 2010-06-03 12:33:15 -07:00
Robby Russell
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
Alan Harper
ba9c78fc9b Import rvm prompt 2010-05-28 08:13:17 +08:00
Mike Hostetler
93f9825b79 share history with your zsh's on the same host 2010-05-08 04:23:50 +08:00
Dylan Clendenin
9efc086fb3 two aliases set to 'ss', clobbering rails script/server 2010-05-08 04:22:34 +08:00
Robby Russell
7a9d4ceb75 Merge remote branch 'jreese/master' 2010-05-07 13:16:50 -07:00
kremso
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
Robby Russell
447da5816e Removing rake autocompletion as this is apparently baked into recent versions of zsh 2010-05-06 21:04:09 -07:00
canthiswait
e8ef16570f escape sequences so rprompt doesn't mess up 2010-05-06 20:46:32 -07:00
canthiswait
02bd8ab53e Added scpectrum script for easy 256 color theaming 2010-05-06 20:46:32 -07:00
Andy Fowler
3c87d48362 makes git status prompt 4x faster
(via git status -s, benchmarked)
2010-05-06 20:37:00 -07:00
John Reese
99d72cad55 Ignore errors from compaudit when using sudo -s 2010-04-08 22:35:35 -04:00
Tomas Kramar
3e1d5fa316 Make Shift+Tab move backwards in the menu 2010-03-22 21:44:15 +01:00
Martin Klepsch
f9509f365b Putting Git related aliases into git.zsh to have them in context. 2009-12-27 21:19:40 -08:00
Dale Campbell
90627d3d1c adding quotes to tab() 2009-12-27 21:16:16 -08:00
Robby Russell
2ecc228b23 Adding a function that will open up a ticket in Lighthouse based on the number and there being a URL in a hidden file. 2009-12-16 11:23:41 -08:00
Robby Russell
98d56a3097 Adding a nocorrect for the heroku command as it was getting triggered by heroku logs. 2009-12-13 11:48:03 -08:00
To1ne
e429ff9e2b no correction on gist 2009-12-12 10:12:14 +01:00
To1ne
dfb3fb5a0a No correction on mkdir + removed duplicate nocorrect mv 2009-12-10 19:04:06 +01:00
Toon Claes
065ae00673 Revert 2009-12-01 23:06:15 +01:00
Toon Claes
dca4651cee Completion from history 2009-11-30 23:28:40 +01:00
Robby Russell
473dd3b212 Adding current_branch function, which can be used like: git pull origin master 2009-11-25 12:45:16 -08:00
Toon Claes
147f1dc702 Modifying changes for issue 25, to fix issue 27 2009-11-09 21:38:40 +01:00
Toon Claes
729fd0ab3c Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2009-11-09 21:28:17 +01:00
Robby Russell
c620408962 Revert "Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed)."
This reverts commit 14a1ce80bb.
2009-11-09 07:33:51 -08:00
Robby Russell
5c13930832 Revert "Whoops, forgot to include this dummy precmd implementation."
This reverts commit a21525ba0c.
2009-11-09 07:33:38 -08:00
Robby Russell
fc3a3c72b1 Only using the contents of .ssh/known_hosts when the file exists for ssh/scp auto-completion. Closes issue #20 2009-11-08 15:34:02 -08:00
Robby Russell
eb05b61483 Removing gdb alias as it conflicts with an actual command for gdb. Closes #17 2009-11-08 15:27:17 -08:00
Robby Russell
286559d180 Revert "Fixed issue #19 'Rake not auto completing'. The stat command syntax that was being used was not correct. Or at least on my machine. See man page for the stat command"
This reverts commit 83907294d6.
2009-11-08 15:24:20 -08:00
meh
8f33231823 Fixed issue #25. 2009-11-09 07:15:06 +08:00
James Adam
a21525ba0c Whoops, forgot to include this dummy precmd implementation. 2009-11-09 07:14:52 +08:00
James Adam
14a1ce80bb Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed). 2009-11-09 07:14:52 +08:00
Toon Claes
bbef2db92b parse error fix 2009-11-05 20:48:08 +01:00
Toon Claes
08fcf7dc39 Enabled colors in ls and made it possible to theme them 2009-11-05 20:44:28 +01:00
Toon Claes
e2dba2c3e9 Joined the appearance so the theme can apply LSCOLORS too 2009-11-04 20:37:18 +01:00
Robby Russell
83309294df Adding devlog alias for tailing development.log for Rails 2009-11-01 14:23:03 -08:00
Robby Russell
fd6861b8cd Fixing some conflict residue that I missed in a commit/merge: 2009-10-26 09:24:37 -07:00
Robby Russell
5fe112eb4b Merge branch 'master' of git://github.com/mrinterweb/oh-my-zsh into mrinterweb/master 2009-10-26 09:19:24 -07:00
Robby Russell
58bccaf6fc Fixing merge conflicts 886d97f41e 2009-10-26 09:16:19 -07:00
Gerhard Lazu
1779bedd53 lsa now uses coloring 2009-10-26 09:09:40 -07:00
Gerhard Lazu
552e4b864a ll doesn't show hidden files, lsa does 2009-10-26 09:09:14 -07:00
Robby Russell
52f5eb2005 Merging conflict. 788c9af056 2009-10-26 09:09:00 -07:00
Robby Russell
56693663ad Merge branch 'master' of git://github.com/mdonoughe/oh-my-zsh into mdonoughe/master 2009-10-26 08:57:29 -07:00
Sean McCleary
83907294d6 Fixed issue #19 'Rake not auto completing'. The stat command syntax that was being used was not correct. Or at least on my machine. See man page for the stat command 2009-10-23 11:59:24 -07:00
Toon Claes
a75d0ba8d7 Fixing merge 2009-10-16 22:14:43 +02:00
Robby Russell
c03aab5164 Renaming script/server --debug alias to ssd to avoid conflict. Closes #1 2009-10-12 19:13:52 -07:00
James Salter
b6c8ef41b1 added gcp alias (git cherry-pick) 2009-10-13 12:34:53 +11:00
To1ne
6ef2e1f51c Added some comment 2009-10-12 21:17:36 +02:00
Gerhard Lazu
788c9af056 Added more aliases for Rails & git 2009-10-11 15:09:10 +01:00
Gerhard Lazu
fdac2b3f04 Added ack-grep searching 2009-10-11 14:49:24 +01:00
Gerhard Lazu
7705ffaf0c Added git diff for vim (gdv) 2009-10-11 09:56:22 +01:00
Matthew Donoughe
c1444a9612 should probably use the value of CASE_INSENSITIVE 2009-10-07 20:08:54 +00:00
Matthew Donoughe
cea6040c30 allow case sensitivity to be toggled 2009-10-07 20:03:23 +00:00
Markus Prinz
60e99779d5 Make "-" an alias for "cd -" (cd back to previous directory) 2009-10-03 19:48:29 +02:00
Jon Evans
eddab5034c run update check *after* running custom configuration scripts.
This means we are running it after $PATH has potentially been set up,
which means it's more likely that commands like "git" will be found
2009-10-01 08:55:07 +01:00
Robby Russell
00a190bc01 Oh My Zsh gets a weekly auto-updater... the future is now! 2009-09-23 17:12:19 -07:00
James Cox
f363c025da put everything in lib 2009-09-23 16:14:43 +01:00
James Cox
8a8a7bafa0 merge upstream 2009-09-23 16:14:04 +01:00
Robby Russell
ff545e6934 Bumping up history to 10k commands 2009-09-23 08:07:02 -07:00
Robby Russell
8debd097fb Moving all zsh config options into a lib/ subdirectory to make way for some upcoming changes to directory structure and configuration options 2009-09-23 07:43:36 -07:00