Commit Graph

530 Commits

Author SHA1 Message Date
Robby Russell
e89f950985 Merge pull request #1256 from seegno/master
Added sf Symfony2 binary alias
2012-12-02 12:43:59 -08:00
Robby Russell
96f35e6949 Merge pull request #1259 from bwl/sublime-fix
Adding logic for ~/Applications folder installs of Sublime Text 2
2012-12-02 12:43:07 -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
ac90eed387 Merge pull request #1274 from sc68cal/feature/git_decorate_log
[Git Plugin] Add shortcut for showing log of all branches
2012-12-02 12:39:55 -08:00
Robby Russell
215d6da3de Merge pull request #1277 from waveface/master
git flow completion enhancement
2012-12-02 12:39:41 -08:00
Robby Russell
44edb3ed60 Merge pull request #1278 from bitboxer/forklift
new forklift plugin
2012-12-02 12:39:23 -08:00
Robby Russell
f28041e41f Merge pull request #1284 from obmarg/feature/debianwhichfix
Debian plugin now pipes which stderr to stdout
2012-12-02 12:38:56 -08:00
Robby Russell
245eee128b Merge pull request #1319 from skatkov/master
Replace cp -verbose with rsync
2012-12-02 12:35:20 -08:00
Robby Russell
04d08577e2 Merge pull request #1336 from aelesbao/plugin-systemd
systemd plugin
2012-12-02 12:27:36 -08:00
Robby Russell
7004ac9ec4 Merge pull request #1371 from rdrey/master
Fixed node-docs
2012-12-02 12:25:02 -08:00
Robby Russell
d5eddc653f Merge pull request #1376 from javageek/master
Updated code
2012-12-02 12:22:19 -08:00
Robby Russell
71af4d73de Merge pull request #1375 from dsx/better-pyclean
A slightly better pyclean
2012-12-02 12:21:26 -08:00
Robby Russell
d3b867d967 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 12:16:30 -08:00
Marcus Müller
ab13d0756f git find 2012-12-02 12:16:14 -08:00
Robby Russell
badc3eb6ce Merge pull request #431 from meh/rsync-plugin
Add rsync plugin.
2012-12-02 12:11:26 -08:00
Robby Russell
c64c30ce93 Merge pull request #214 from allancaffee/master
Improved completion for vagrant
2012-12-02 12:07:56 -08:00
Robby Russell
4fea3ce219 Merge pull request #1455 from NeuralSandwich/master
Battery plugin: Added support for Apple Macs
2012-12-02 12:07:13 -08:00
Robby Russell
e477085993 Merge pull request #1456 from sputnikus/master
Function for managing pacman-key command on Arch Linux
2012-12-02 12:06:38 -08:00
Robby Russell
ef5a65b207 Renaming cap to capistrano 2012-12-02 12:00:52 -08:00
Martin Putniorz
8fe6ea3889 Functions for managing pacman-key 2012-12-02 20:55:19 +01: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
Sean Jones
e226fc048a Added support for Mac to battery plugin 2012-12-02 19:36:33 +00:00
Michael Nikitochkin
f29daef297 Fix repo for github. 2012-12-02 14:16:58 +02: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
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
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
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
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
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
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
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
aaca1c2558 Merge pull request #1395 from caarlos0/master
added some maven love <3
2012-11-25 11:38:54 -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
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