1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-28 15:21:58 +00:00
Commit graph

251 commits

Author SHA1 Message Date
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
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
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
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