Commit Graph

2859 Commits

Author SHA1 Message Date
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
2e5a689c05 Merge pull request #1265 from aletessier/ssh-completion
Fix ssh plugin completion
2012-12-02 12:42:08 -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
Sean Jones
5991bf3ac1 Fixed Kernel Detection in battery plugin 2012-12-02 20:39:01 +00: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
66df0f8089 Merge pull request #1317 from thcipriani/junkfood_theme
Added junkfood theme
2012-12-02 12:36:32 -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
93f41fc5fc Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 12:30:51 -08:00
Trae Robrock
fe094712fb resolving conflict in termsupport plugin 2012-12-02 12:30:46 -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
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
5ed75de5ce Merge pull request #1353 from a-b/master
Prompt symbol update
2012-12-02 12:26:12 -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
dad9352748 Merge pull request #1378 from hjhart/master
Rapid Board url format
2012-12-02 12:20:52 -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
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
423d66da5b Merge pull request #409 from Bregor/patch-1
Dollar sign instead of percent in unprivileged user prompt (as in real ge
2012-12-02 12:10:32 -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
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
Martin Putniorz
8fe6ea3889 Functions for managing pacman-key 2012-12-02 20:55:19 +01:00
Robby Russell
56f094860b Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-12-02 11:50:36 -08:00
Sean Jones
5f62d2c183 Added Candy-Kingdom theme 2012-12-02 19:46:53 +00: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
Sean Jones
e226fc048a Added support for Mac to battery plugin 2012-12-02 19:36:33 +00:00
Viktor Gamov
54f1990511 Update plugins/sublime/sublime.plugin.zsh
updated run sublime on linux with parameters
2012-12-02 13:54:24 -05:00
Robby Russell
e4a596c095 Merge pull request #516 from adben/master
New Theme
2012-12-02 10:51:25 -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
Alexander Simonov
f9de64460c Simonoff theme 2012-12-02 19:56:17 +02: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