Commit Graph

1258 Commits

Author SHA1 Message Date
Robby Russell
11ff3b642d Removing mcd as it conflicts with mtools 2012-12-02 12:05:58 -08:00
Robby Russell
ef5a65b207 Renaming cap to capistrano 2012-12-02 12:00:52 -08:00
Robby Russell
56f094860b Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 11:50:36 -08:00
Robby Russell
80ab595696 Merge pull request #256 from lorrin/no-op_command-not-found
Make command-not-found no-op when support not available (e.g. not on Ubuntu)
2012-12-02 11:43:30 -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
Robby Russell
e4a596c095 Merge pull request #516 from adben/master
New Theme
2012-12-02 10:51:25 -08:00
Robby Russell
8796fd01cc Merge pull request #455 from aslamnd/master
New theme
2012-12-02 09:54:54 -08:00
Robby Russell
08cb82b9f4 Merge pull request #448 from n0nick/patch-1
Updated the frisk theme to display Bazaar branch information as well
2012-12-02 09:54:24 -08:00
Robby Russell
7dfd6406d8 Merge pull request #1451 from rmcastil/modify_readme_to_clarify_the_manual_way
Modify readme to clarify the manual way
2012-12-02 09:43:06 -08:00
Robby Russell
31ad21398e Merge pull request #1452 from miry/github
Fix repo for github.
2012-12-02 09:41:51 -08:00
Michael Nikitochkin
f29daef297 Fix repo for github. 2012-12-02 14:16:58 +02:00
Ryan Castillo
60c3813472 Make the NOTE an optional for improved instructions 2012-12-01 21:10:23 -05:00
Ryan Castillo
5b201468d1 Improve formatting of step 2 for clarity 2012-12-01 21:03:07 -05:00
Robby Russell
22f827e122 Merge pull request #1393 from agate/patch-2
Update plugins/git-flow/git-flow.plugin.zsh
2012-12-01 12:02:35 -08:00
Robby Russell
2e55825f9c Merge pull request #1365 from pcasaretto/add-heroku-remote-switch
Add the heroku --remote switch
2012-12-01 11:59:21 -08:00
Robby Russell
b8e230205a Merge pull request #1366 from op/last-working-dir
Added last working directory plugin
2012-12-01 11:59:03 -08:00
Robby Russell
9a88e76823 Merge pull request #1370 from ericmathison/syntax-fix
Fix color syntax
2012-12-01 11:58:21 -08:00
Robby Russell
f9c1a7242f Merge pull request #1347 from paulredmond/plugin/jira
Jira Plugin - Wrong URL 
2012-12-01 11:57:21 -08:00
Robby Russell
aad58afc54 Merge pull request #1386 from sanbor/master
Pass plugin for completion
2012-12-01 11:44:04 -08:00
Robby Russell
e3b97db493 Merge pull request #1390 from pluton8/bugfix/autojump21
Fix sourcing brew's autojump of version 21.0.3+
2012-12-01 11:42:19 -08:00
Robby Russell
2aa485ac04 Merge pull request #1435 from Drarok/fix-svn
Fix backwards svn "dirty" state detection
2012-12-01 11:41:17 -08:00
Robby Russell
3657bf8efa Merge pull request #1421 from cristim/master
Added a small mod of the tjkirch theme
2012-12-01 11:40:44 -08:00
Robby Russell
25a2f029a4 Merge pull request #1399 from tresni/patch-1
Update themes/minimal.zsh-theme
2012-12-01 11:39:54 -08:00
Robby Russell
08efdcdd16 Merge pull request #1400 from tresni/patch-2
Updated svn.plugin.zsh to behave more like lib/git.zsh
2012-12-01 11:39:21 -08:00
Robby Russell
66e784c8c1 Merge pull request #1416 from talmuth/master
Add support of multiple screen variants in screen plugin
2012-12-01 11:38:52 -08:00
Robby Russell
26d46546a6 Merge pull request #1410 from jimhester/per-directory-history
Replace reset-prompt with push-line and accept-line
2012-12-01 11:36:22 -08:00
Robby Russell
ddb8d46e98 Merge pull request #1411 from niceview/rvm
Use rvm completion from ~/.rvm/scripts/zsh/Completion
2012-12-01 11:35:48 -08:00
Robby Russell
f2050fc093 Merge pull request #1413 from arnihermann/master
Implement 'gup' as git pull --rebase
2012-12-01 11:33:40 -08:00
Robby Russell
29b66b85c8 Merge pull request #1412 from jdavis/coffee_plugin
Added a CoffeeScript plugin.
2012-12-01 11:33:07 -08:00
Robby Russell
5189cb8843 Merge pull request #1418 from Mehonoshin/patch-2
Added gwc(git whatchanged alias) to git plugin
2012-12-01 11:32:35 -08:00
Robby Russell
bc1a06aab4 Merge pull request #1419 from ssrihari/master
Alias 'rdbtp' to rake db:test:prepare to rails plugin
2012-12-01 11:32:09 -08:00
Robby Russell
293a65c9d8 Merge pull request #1439 from maxbane/master
Revert "Fix to restore bindings after switching to vi-mode"
2012-12-01 11:31:21 -08:00
Robby Russell
3dc1d92950 Merge pull request #1442 from willman500/git-hub-flow-plugin
Add autocomplete for git "hubflow"
2012-12-01 11:30:37 -08:00
Robby Russell
f69b05b03a Merge pull request #1445 from knxroot/master
urltools more fast
2012-12-01 11:29:55 -08:00
Robby Russell
ded745bf14 Modifying documentation in zshrc template for new config option 2012-11-30 05:58:08 -08:00
Robby Russell
533a281919 Merge pull request #1430 from danielsoneg/egd-update_frequency
Add UPDATE_ZSH_DAYS setting
2012-11-30 05:47:32 -08:00
Robby Russell
8a2314edee Merge pull request #1437 from Partyschaum/master
Some fixes for the agnoster theme / Fixed autocompletion for autojump with homebrew
2012-11-30 05:40:02 -08:00
Robby Russell
067178d877 Merge pull request #1446 from suzaku/patch-1
fix typo in theme
2012-11-30 05:37:35 -08:00
satoru
263107ed7f fix typo 2012-11-30 11:55:45 +08:00
Gustavo
3b6fae14fb Node.js version of urltools es more fast (53% aprox), you can try this with strace -o trace -c -Ttt 2012-11-28 20:33:45 -03:00
Will Weaver
1b4393fbb6 Add autocomplete for git "hubflow"
This was copied from the git-flow plugin and necessary changes made for the additional features.

http://dev.datasift.com/blog/hubflow-github-and-gitflow-model-together

HubFlow is git flow with additional features to help with use of github.
2012-11-28 08:09:25 -05:00
Hauke Stange
5c98325772 fixed autojump: autocompletion works with homebrew again 2012-11-28 10:47:31 +01:00
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