 Robby Russell
|
a2c8db9eb3
|
Resolving conflict in #1266 merge
|
2013-04-23 20:30:21 -07:00 |
|
|
Robby Russell
|
7cdb6d667c
|
Resolving conflict when merging in 1570
|
2013-04-23 20:21:18 -07:00 |
|
|
Robby Russell
|
d6a36b1756
|
Merge pull request #1575 from mguindin/agnoster-change
[agnoster-theme] modifying theme for dirty/staged files
|
2013-04-23 20:17:40 -07:00 |
|
|
Robby Russell
|
b61555d7c0
|
Merge pull request #1582 from To1ne/pushdminus
use pushdminus
|
2013-04-23 20:16:41 -07:00 |
|
|
Robby Russell
|
8fea507b5c
|
Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
|
2013-04-23 20:04:08 -07:00 |
|
|
Robby Russell
|
de8bcef476
|
Merge pull request #1622 from hacfi/patch-1
Fix Symfony2 command completion 'permission denied'
|
2013-04-23 20:03:26 -07:00 |
|
|
Robby Russell
|
cb8ccaf3cc
|
Merge pull request #1634 from Anahkiasen/patch-1
Add alias for "composer dump-autoload"
|
2013-04-23 20:03:10 -07:00 |
|
|
Robby Russell
|
7787d1da6e
|
Merge pull request #1641 from NeuralSandwich/master
Battery plugin updates
|
2013-04-23 20:01:40 -07:00 |
|
|
Robby Russell
|
1235b77eff
|
Merge pull request #1702 from mbauhardt/copyfile
a plugin (function) which copies the content of a file into the clipboar...
|
2013-04-23 19:59:51 -07:00 |
|
|
Robby Russell
|
42127bee6d
|
Merge pull request #1715 from dbohdan/master
Fixed a UTF-8 problem in the theme "fishy"
|
2013-04-23 19:58:59 -07:00 |
|
|
Robby Russell
|
966108a082
|
Merge pull request #1724 from miry/rails_aliases
Added global aliases to use RAILS_ENV.
|
2013-04-23 19:58:30 -07:00 |
|
|
Robby Russell
|
6daaae6347
|
Merge pull request #1703 from marcparadise/mp/knife-chef-11-initial-support
initial support for chef 11 integrated knife-essentials
|
2013-04-23 19:56:44 -07:00 |
|
|
Robby Russell
|
73edf1f1eb
|
Merge pull request #1704 from laggyluke/st3
Support for Sublime Text 3
|
2013-04-23 19:56:26 -07:00 |
|
|
Robby Russell
|
1ae16a20d8
|
Merge pull request #1718 from toctan/master
command-not found support for Arch Linux
|
2013-04-23 19:55:46 -07:00 |
|
|
Robby Russell
|
2badd62c0e
|
Merge pull request #1721 from z2v/hgplugin
Mercurial: add alias for 'hg bookmarks'
|
2013-04-23 19:55:30 -07:00 |
|
|
Robby Russell
|
108fe7c933
|
Merge pull request #1707 from bkg/django-static
Add django plugin command
|
2013-04-23 19:53:50 -07:00 |
|
|
Robby Russell
|
b01a48d056
|
Merge pull request #1714 from f0y/07738ea86330b7b77127fc6f18474b3da2c6ecec
Colorize plugin
|
2013-04-23 19:53:33 -07:00 |
|
|
Robby Russell
|
51d7d57331
|
Merge pull request #1719 from MatthR3D/master
Improved the archlinux plugin
|
2013-04-23 19:50:21 -07:00 |
|
|
Robby Russell
|
2a2cc81ea5
|
Merge pull request #1726 from rkj/master
Slightly changed my themes to include return code of last invoked command.
|
2013-04-23 19:49:12 -07:00 |
|
|
Robby Russell
|
d8b6acd0af
|
Merge pull request #1728 from szines/patch-1
Update rvm.plugin.zsh to the latest ruby versions
|
2013-04-23 19:48:55 -07:00 |
|
|
Robby Russell
|
b5ead7be01
|
Merge pull request #1729 from statschner/master
Added git-flow-avh plugin
|
2013-04-23 19:48:15 -07:00 |
|
|
Robby Russell
|
91cb7955cb
|
Merge pull request #1739 from felipec/fc/gitfast
Updates to gifast
|
2013-04-23 19:46:54 -07:00 |
|
|
Robby Russell
|
e953fcf516
|
Merge pull request #1749 from johnjohndoe/feature/zeus-auto-completion
Add auto-completion for zeus.
|
2013-04-23 19:46:09 -07:00 |
|
|
Robby Russell
|
81ed18f722
|
Merge pull request #1733 from jaseg/patch-1
The safe-paste plugin now works with tmux, too
|
2013-04-23 19:45:29 -07:00 |
|
|
Robby Russell
|
78bb69968d
|
Merge pull request #1734 from cborgia/master
simple grammar change in template file
|
2013-04-23 19:45:15 -07:00 |
|
|
Robby Russell
|
bba45753ca
|
Merge pull request #1737 from hron84/feature-bundler-add-cleanup
Adding undocumented clean command to completion
|
2013-04-23 19:44:28 -07:00 |
|
|
Robby Russell
|
56b4d4d639
|
Merge pull request #1738 from ronshapiro/master
Battery plugin changes
|
2013-04-23 19:44:11 -07:00 |
|
|
Robby Russell
|
d8d9da025b
|
Merge pull request #1748 from tobiassjosten/patch-1
Added 'jekyll' to list of bundled commands
|
2013-04-23 19:43:26 -07:00 |
|
|
Robby Russell
|
30b0eb3ffa
|
Merge pull request #1740 from felipec/fc/git
git: fix parse_git_dirty()
|
2013-04-23 19:42:58 -07:00 |
|
|
Robby Russell
|
adb86fa83d
|
Merge pull request #1750 from JamesFerguson/master
Make git_remote_branch plugin git-flow friendly
|
2013-04-23 19:42:33 -07:00 |
|
|
Robby Russell
|
93ee939383
|
Merge pull request #1745 from jtheoof/master
Added option to allow untracked files as non dirty
|
2013-04-22 19:08:55 -07:00 |
|
|
Robby Russell
|
5f32c8e155
|
Merge pull request #1747 from dhemmerling/mvn_tomcat-redeploy
mvn plugin was missing "redeploy" completion for tomcat.
|
2013-04-22 19:07:07 -07:00 |
|
|
Robby Russell
|
85426a57a2
|
Merge pull request #1526 from filipechagas/master
Gitfast plugin - Untracked files char not shown %
|
2013-04-12 06:17:19 -07:00 |
|
|
Robby Russell
|
085af13b47
|
Merge pull request #1531 from lcosmin/master
Fixed 'ls' issue on NetBSD
|
2013-04-12 06:16:54 -07:00 |
|
|
Robby Russell
|
d4fb254d28
|
Merge pull request #1532 from ryanneufeld/torrent_tools
Adding torrent tools plugin.
|
2013-04-12 06:16:39 -07:00 |
|
|
Robby Russell
|
631da358a5
|
Merge pull request #1537 from everbird/master
fabric plugin
|
2013-04-12 06:16:25 -07:00 |
|
|
Robby Russell
|
4d01d795b3
|
Merge pull request #1540 from goofansu/add-rebar-plugin
Add rebar plugin
|
2013-04-12 06:16:06 -07:00 |
|
|
Robby Russell
|
d8e700c1b6
|
Merge pull request #1651 from deepusudhakar/master
Escape $ZSH path in upgrade_oh_my_zsh
|
2013-04-12 05:56:50 -07:00 |
|
|
Robby Russell
|
f2a927f9b2
|
Merge pull request #1696 from henryyan/master
Added $PATH to PATH in install shell
|
2013-04-12 05:56:24 -07:00 |
|
|
Robby Russell
|
41180bfe10
|
Merge pull request #1700 from Bercio/master
Was broken, >! doesn't work with noclobbing. Fixed it.
|
2013-04-12 05:55:56 -07:00 |
|
|
Robby Russell
|
6a5afc1ff7
|
Merge pull request #1701 from mbauhardt/copydir
a plugin (function) which copies the current directory into the clipboar...
|
2013-04-11 14:57:34 -07:00 |
|
|
Robby Russell
|
459e7fffc4
|
Merge pull request #1706 from keyvez/master
Fixes Issue#1705
|
2013-04-11 14:57:06 -07:00 |
|
|
Robby Russell
|
2a0c1d7b92
|
Merge pull request #1711 from bertabus/master
Vundle clean function
|
2013-04-11 14:56:36 -07:00 |
|
|
Robby Russell
|
0198a12953
|
Merge pull request #1699 from Bercio/patch-1
>! doesn't work with noclobber. changed >! to >| and echo "$PWD" to pwd(redundant)
|
2013-04-08 12:43:43 -07:00 |
|
|
Robby Russell
|
4300b63462
|
Merge pull request #1689 from afh/pull/emoji_clock
Add emoji-clock plugin
|
2013-04-08 12:42:43 -07:00 |
|
|
Robby Russell
|
989b6ec29e
|
Merge pull request #1208 from jaischeema/master
Add new theme : jaischeema
|
2013-04-07 19:32:41 -07:00 |
|
|
Robby Russell
|
b68db6e15a
|
Merge pull request #1060 from danielbayerlein/new-theme-inspired-by-peepcode
Add Theme "itchy"
|
2013-04-07 19:31:54 -07:00 |
|
|
Robby Russell
|
7e046d320f
|
Merge pull request #729 from doitian/plugin_tmuxinator
tmuxinator completion
|
2013-04-07 19:30:30 -07:00 |
|
|
Robby Russell
|
b2421cc73f
|
005d967dc4
|
2013-04-07 19:26:40 -07:00 |
|
|
Robby Russell
|
b57284244e
|
Merge pull request #1632 from jmatth/tmux_plugin
Adding Tmux Plugin
|
2013-04-07 19:08:44 -07:00 |
|
|
Robby Russell
|
2d0c9e771d
|
Merge pull request #1652 from z2v/master
Add useful aliases accompanying 'push/pull' activites
|
2013-04-07 19:06:45 -07:00 |
|
|
Robby Russell
|
cd55560c74
|
Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6
parse_git_dirty() support for Git 1.6
|
2013-04-07 19:06:31 -07:00 |
|
|
Robby Russell
|
dda1154c80
|
Merge pull request #1655 from nubs/phing-and-cache-files
Improve portability of cache file detection for command targets
|
2013-04-07 19:05:59 -07:00 |
|
|
Robby Russell
|
e041b50742
|
Merge pull request #1656 from hacfi/patch-2
Autocomplete composer default methods if composer.json is not available
|
2013-04-07 19:05:08 -07:00 |
|
|
Robby Russell
|
037b691c19
|
Merge pull request #1665 from bmcorser/patch-1
Alias for commit and commit all with amend
|
2013-04-07 19:04:45 -07:00 |
|
|
Robby Russell
|
2606772676
|
Merge pull request #1679 from KokaKiwi/master
A new plugin "colored-man" and a greeny theme "kiwi"
|
2013-04-07 19:03:39 -07:00 |
|
|
Robby Russell
|
3726c49596
|
Merge pull request #1680 from zbrox/master
Powify autocomplete
|
2013-04-07 19:02:58 -07:00 |
|
|
Robby Russell
|
eadca724b7
|
Merge pull request #1681 from akre54/add-bower
add bower autocompletion
|
2013-04-07 19:02:24 -07:00 |
|
|
Robby Russell
|
0169654bf0
|
Merge pull request #1685 from justinclayton/patch-1
Update _vagrant
|
2013-04-07 19:01:54 -07:00 |
|
|
Robby Russell
|
b95c0e827b
|
Merge pull request #1686 from timsly/hub-autocomplete
added hub autocomplete instructions
|
2013-04-07 19:01:42 -07:00 |
|
|
Robby Russell
|
3dc073a542
|
Merge pull request #1690 from docwhat/git-untracked
This fixes checking for git untracked items
|
2013-04-07 19:00:22 -07:00 |
|
|
Robby Russell
|
601d4d6efc
|
Merge pull request #1662 from rylwin/patch-1
last-working-dir: Use >! to overwrite $cache_file
|
2013-04-07 18:58:50 -07:00 |
|
|
Robby Russell
|
ca384067e6
|
Merge pull request #1674 from simeonwillbanks/master
Fixes #1485 Zeus should not be bundled
|
2013-04-07 18:58:03 -07:00 |
|
|
Robby Russell
|
77ca980bfa
|
Merge pull request #1678 from lesmyrmidons/symfony2
Symfony2
|
2013-04-07 18:57:21 -07:00 |
|
|
Robby Russell
|
1d66bef550
|
Merge pull request #1682 from maplebed/ben.knife
Allow you to customize the path to knife config files
|
2013-04-07 18:57:00 -07:00 |
|
|
Robby Russell
|
b906454238
|
Merge pull request #1691 from gianu/master
NEW THEME: gianu
|
2013-04-07 18:54:19 -07:00 |
|
|
Robby Russell
|
397d4ae1f2
|
Merge pull request #1697 from dsx/sublime-plugin-fix
Prevents echo of _sublime_darwin_paths contents on zsh startup
|
2013-04-07 18:51:18 -07:00 |
|
|
Robby Russell
|
ac0dddb1fc
|
Merge pull request #1698 from ConradIrwin/safe-paste
safe-paste plugin
|
2013-04-07 18:51:03 -07:00 |
|
|
Robby Russell
|
b8b241f630
|
Merge pull request #749 from blueyed/setopt-correct
Only `setopt correct`, not "correct_all".
|
2013-03-26 22:14:20 -07:00 |
|
|
Robby Russell
|
5e7e987ff7
|
Merge pull request #1657 from ysmood/master
Add a new theme 'ys'
|
2013-03-26 22:12:48 -07:00 |
|
|
Robby Russell
|
95b46e7eac
|
Merge pull request #1658 from kavu/patch-1
Fix git dirty status in dallas.zsh-theme
|
2013-03-26 22:12:21 -07:00 |
|
|
Robby Russell
|
d9bf1adca6
|
Merge pull request #1659 from AshleyS/master
Fixed base64 decode parameter for newer versions of base64 binary
|
2013-03-26 22:12:01 -07:00 |
|
|
Robby Russell
|
5cde893ce0
|
Merge pull request #1661 from hellerbarde/master
Fix some problems with git enabled prompts where they *always* claim to have untracked files
|
2013-03-26 22:11:04 -07:00 |
|
|
Robby Russell
|
4e101bed86
|
Merge pull request #1558 from sbooob/master
Mercurial repository info in agnoster theme
|
2013-03-26 22:05:55 -07:00 |
|
|
Robby Russell
|
2239035368
|
Merge pull request #1573 from flz/master
Add new profiles plugin.
|
2013-03-26 22:02:45 -07:00 |
|
|
Robby Russell
|
9276b5f8ac
|
Merge pull request #1595 from nevir/sublime3-support
Support for Sublime Text 3, with fallback
|
2013-03-26 22:01:31 -07:00 |
|
|
Robby Russell
|
6f72d6c17c
|
Merge pull request #1598 from zasdfgbnm/master
new plugin
|
2013-03-26 22:00:52 -07:00 |
|
|
Robby Russell
|
c867684fe1
|
Merge pull request #1607 from gekken/master
added ruby 2.0.0 to rvm plugin
|
2013-03-26 21:59:48 -07:00 |
|
|
Robby Russell
|
5b7f49e6c6
|
Merge pull request #1610 from mcaserta/scala_and_sbt_plugins
SBT and Scala plugins.
|
2013-03-26 21:58:22 -07:00 |
|
|
Robby Russell
|
ed69d1e736
|
Merge pull request #1611 from ripdog/patch-1
Update plugins/extract/extract.plugin.zsh
|
2013-03-26 21:57:54 -07:00 |
|
|
Robby Russell
|
eabf51e0fe
|
Merge pull request #1614 from miklos-martin/bower
Bower plugin
|
2013-03-26 21:57:26 -07:00 |
|
|
Robby Russell
|
a3a6b91818
|
Merge pull request #1616 from sxeraverx/master
pipe git version check error to /dev/null (for when git doesn't exist)
|
2013-03-26 21:56:35 -07:00 |
|
|
Robby Russell
|
d3d3f0e8b9
|
Merge pull request #1524 from bonifaido/master
Maven plugin completion fix for other (than Java) JVM languages and/or missing test cases folder
|
2013-03-26 21:51:32 -07:00 |
|
|
Robby Russell
|
280c3df90e
|
Merge pull request #1638 from RomainBelorgey/master
Use completion if file Capfile
|
2013-03-26 21:49:03 -07:00 |
|
|
Robby Russell
|
74859240be
|
Merge pull request #1650 from ishtu/master
add vncviewer function (using "open" functionality)
|
2013-03-26 21:48:36 -07:00 |
|
|
Robby Russell
|
650bace5c5
|
Merge pull request #1663 from flavius/master
allow setting a custom HISTFILE before oh-my-zsh is loaded
|
2013-03-26 21:47:58 -07:00 |
|
|
Robby Russell
|
b0d80a0175
|
Merge pull request #1664 from marcel-wolf/master
add ssh-agent option to set default lifetime for identities
|
2013-03-26 21:47:00 -07:00 |
|
|
Robby Russell
|
0b5d983897
|
Merge pull request #1668 from sheerun/patch-1
Use --no-rehash option for faster startup
|
2013-03-26 21:46:31 -07:00 |
|
|
Robby Russell
|
6a8e79fda0
|
Merge pull request #1669 from desimone/master
support for Go (golang) completions
|
2013-03-26 21:46:06 -07:00 |
|
|
Robby Russell
|
2c069885cc
|
Merge pull request #1671 from lifinsky/master
Fix grails plugin
|
2013-03-26 21:45:13 -07:00 |
|
|
Robby Russell
|
0ab0e67ecf
|
Merge pull request #1645 from mbologna/master
a new theme, different from the already existent themes :)
|
2013-03-06 06:15:25 -08:00 |
|
|
Robby Russell
|
fce68bbba0
|
Merge pull request #1594 from jbhannah/rbenv-gems-fix
Fix rbenv gems helper
|
2013-02-09 11:55:30 -08:00 |
|
|
Robby Russell
|
1a362c11a8
|
Merge pull request #1583 from To1ne/pj.plugin
added pj.plugin
|
2013-02-09 11:55:03 -08:00 |
|
|
Robby Russell
|
6e6cf43037
|
Merge pull request #1586 from HeroicEric/master
add rspec alias to zeus plugin
|
2013-02-07 19:30:03 -08:00 |
|
|
Robby Russell
|
615e41b0ec
|
Adding MIT-LICENSE Closes #655
|
2013-01-15 06:45:27 -08:00 |
|
|
Robby Russell
|
cf03ee6d88
|
Merge pull request #1534 from gberenfield/master
Tested fix for Issue #1479
|
2013-01-10 22:39:37 -08:00 |
|
|
Robby Russell
|
312da3ea05
|
Merge pull request #941 from dcreager/configurable-blinks-theme
blinks theme works with light and dark Solarized
|
2013-01-10 22:37:25 -08:00 |
|
|
Robby Russell
|
9ef7e8a191
|
Merge pull request #1077 from Mezzle/add-option-to-show-git-status
Add option to disable status notification
|
2013-01-10 22:36:16 -08:00 |
|
|
Robby Russell
|
a634d50645
|
Merge pull request #1054 from ptillemans/master
Updated subcommands for leiningen plugin
|
2013-01-10 22:34:23 -08:00 |
|
|
Robby Russell
|
64db7b56f2
|
Merge pull request #1164 from fuksito/master
More usable aliases
|
2013-01-10 22:33:47 -08:00 |
|