Commit graph

1849 commits

Author SHA1 Message Date
Hauke Stange
12f416b125 Merge branch 'master' of github.com:Partyschaum/oh-my-zsh 2012-11-28 10:40:09 +01:00
Hauke Stange
5d6252c6d0 fixed autojump plugin: works with homebrew again now 2012-11-28 10:39:59 +01:00
Max Bane
53854754e0 Revert "Fix to restore bindings after switching to vi-mode"
This reverts commit b609aa0e6c -- this commit
was a bad idea, because it makes vi-mode very difficult to use. The default
`bindkey` keybindings are NOT MEANT to coexist with `bindkey -v` Vi mode;
that's why `bindkey -v` clears them in the first place! Restoring all of the
default keybindings after enabling Vi mode, the way the reverted commit did,
causes many collisions between those default keybindings that begin with ESC
and the command-mode-initiating ESC of Vi mode. See Issue 1438 of
robbyrussell/oh-my-zsh. If people have custom keybindings, they should create
them in their ~/.zshrc AFTER enabling the vi-mode plugin and sourcing
oh-my-zsh.sh.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   plugins/vi-mode/vi-mode.plugin.zsh
#
2012-11-28 02:02:58 -05:00
Hauke Stange
3d7622831f fixed symbolic-ref git view of agnoster theme 2012-11-27 21:43:23 +01:00
Hauke Stange
7fc612bcb9 removed 'x' from prompt_context() function name 2012-11-27 21:20:56 +01:00
Drarok Ithaqua
120db35b2d Fix the backwards svn status, and add comments explaining which way grep does things. 2012-11-27 12:08:18 +00:00
Drarok Ithaqua
79e620c392 Whitespace cleanup. 2012-11-27 12:03:51 +00:00
Eric Danielson
200a25818a Add UPDATE_ZSH_DAYS setting 2012-11-26 11:35:16 -08:00
Robby Russell
d750e7d9e3 Merge pull request #1426 from caarlos0/master
fixing issue 1423
2012-11-25 18:08:18 -08:00
Carlos Alexandro Becker
75e5a6dcfc fixes my wrong commit - fixes #1423 2012-11-25 20:34:12 -02:00
Robby Russell
6fbe594238 Merge pull request #1391 from logicmd/master
sublime text not found in Ubuntu
2012-11-25 11:39:45 -08:00
Robby Russell
03c2712243 Merge pull request #1388 from fuadsaud/agnoster_theme_show_exit_status
agnoster theme shows error code instead of an "x"
2012-11-25 11:39:08 -08:00
Robby Russell
aaca1c2558 Merge pull request #1395 from caarlos0/master
added some maven love <3
2012-11-25 11:38:54 -08:00
Robby Russell
802c2df7ba Merge pull request #1406 from chinghanho/master
Improved statistics functions
2012-11-25 11:37:43 -08:00
Robby Russell
a5bc97f76b Merge pull request #1404 from Bklyn/master
Fix for "?" and "!" in svn status output
2012-11-25 11:36:46 -08:00
Robby Russell
1b4a23ac8b Merge pull request #1396 from webframp/fix/brew-autojump-zsh
Fix for brew installed autojump
2012-11-25 11:36:09 -08:00
Robby Russell
63cd6ef7eb Merge pull request #1415 from jmatth/git_root_pull
Adding grt alias to the git plugin.
2012-11-25 11:35:48 -08:00
Robby Russell
fdfc0b3cd9 Merge pull request #1417 from felipec/fc-git-upstream
Add gifast plugin
2012-11-25 11:35:24 -08:00
Cristian Măgherușan-Stanciu
7c768543df Added a small mod of the tjkirch theme
- single-line prompt
- removed the extra line after each command output
2012-11-25 17:15:16 +01:00
Srihari Sriraman
b2b5e3a754 Added alias to rake db:test:prepare
Quite often, db:test:prepare is run after db:migrate.
Added for convenience.
2012-11-24 20:42:40 +05:30
Stanislav Mekhonoshin
7991562e76 Added gwc(git whatchanged alias)
Allows to view commit history in extended way
2012-11-24 11:23:44 +04:00
Felipe Contreras
5a11228e93 Add gifast plugin
Using the upstream git completion and prompt stuff.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2012-11-22 17:45:37 +01:00
Carlos Alexandro Becker
5ff4a0030f e alias 2012-11-22 14:20:53 -02:00
Carlos Alexandro Becker
60b7dd8af5 fixing various issues with build, add runinstall option 2012-11-22 10:42:11 -02:00
Carlos Alexandro Becker
a366456284 fixing some build issues... 2012-11-22 09:20:31 -02:00
Denys Lózko
af729cc476 Add support of screen-* $TERM in screen plugin 2012-11-22 00:48:44 +02:00
Carlos Alexandro Becker
2acd30ed05 fixing issue with solr in jboss start 2012-11-21 16:35:31 -02:00
Carlos Alexandro Becker
9b1c64d7ff go 2012-11-21 16:20:43 -02:00
Carlos Alexandro Becker
89614be1af param -i para gerar installer 2012-11-21 16:01:28 -02:00
Carlos Alexandro Becker
50e538aeb5 oops 2012-11-21 15:35:28 -02:00
Carlos Alexandro Becker
72974ce409 totvs utils 2012-11-21 15:29:09 -02:00
Josh Matthews
7be660bf1d Adding grt alias to the git plugin. 2012-11-20 13:13:04 -05:00
Árni Hermann Reynisson
003b0da9e5 Use pull --rebase for 'gup' shortcut.
Instead of git fetch && git rebase.
2012-11-20 15:01:39 +00:00
Tiago Ribeiro
6c45d217af Added host to prompt 2012-11-20 00:33:52 +00:00
Rui Marinho
6f6a3c8435 Added sf Symfony2 binary alias 2012-11-20 00:33:52 +00:00
Josh Davis
4c96e530a3 Added a CoffeeScript plugin. 2012-11-19 08:21:53 -06:00
Jeong Mok Cho
7d9518d48d Use rvm completion from ~/.rvm/scripts/zsh/Completion 2012-11-19 17:04:10 +09:00
Jim Hester
9ba799111c Replace reset-prompt with push-line and accept-line
The in memory history is not updated until an accept line command, so you
have to push enter before it is correct, this commit replaces the reset-prompt
with an accept-line.  It also adds a push-line, to preserve the current editing
buffer
2012-11-16 10:50:41 -05: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
Caleb Epstein
91c57e6d42 Untabify 2012-11-13 12:48:37 -05:00
Caleb Epstein
f2ac08832a Handle metachars in svn status output using grep -q 2012-11-12 11:53:09 -05:00
Brian Hartvigsen
1b768a3b40 Update plugins/svn/svn.plugin.zsh
Behave more like lib/git.zsh.
Set `SVN_SHOW_BRANCH="true"` to display branch/tag or trunk instead of just repo name.
Falls back to repo name if branch information is not available.

Idea and awk call from revans/bash-it/themes/base.theme.bash
2012-11-08 13:48:43 -07:00
Brian Hartvigsen
99468cb4ec Update themes/minimal.zsh-theme
Cleans up minimal theme by not using a custom prompt function
Removed case of 2 spaces showing if not in a version controlled folder
Adds support for svn_prompt_info
2012-11-07 23:53:44 -07:00
Carlos Alexandro Becker
8871c7a6d0 made dpkg -i more util 2012-11-07 10:28:44 -02:00
Sean Escriva
f967f2bfd7 update autojump plugin for latest brew installed autojump 2012-11-06 13:38:08 -08:00
Carlos Alexandro Becker
8723a2ce58 mvn.colors.plugin.zsh was not read... mergin with mvn.plugin.zsh. 2012-11-06 15:44:50 -02:00
Carlos Alexandro Becker
15e0dc9ec9 Added some maven love. 2012-11-06 15:39:59 -02:00
Hao Hong
ec9b5500a5 Update plugins/git-flow/git-flow.plugin.zsh
Fixed git-flow feature publish's desc error

72aeaa9d9e (commitcomment-2104214)
2012-11-05 16:33:21 -08:00
汤凯 Kevin Tong
19aefa2bd6 Update plugins/sublime/sublime.plugin.zsh
Considering the situation when installing sublime text via apt-get (WebUpd8 Sublime Text 2 PPA)
2012-11-05 16:55:55 +08:00
Eugene Nikolsky
cd0e7c5e49 Fix sourcing brew's autojump of version 21.0.3+
Starting with autojump 21.0.3+ there is no file autojump in etc/
directory, so we source the autojump.zsh file directly. Version 20 has
it as well, so there should be no problems with earlier versions.

Comments on autojump's update in homebrew:
5da9c4d5eb (Library)/Formula/autojump.rb
2012-11-05 10:34:29 +02:00