adphi/oh-my-zsh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,643 Commits 2 Branches 0 Tags 19 MiB
91cb7955cb
Commit Graph

1643 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
JamesFerguson
d4d8939410 Only trim remote names; be git-flow friendly 
- don't remove everything before the last /
 - do remove <remote_name>/
 - allows flow style feature/foobar branch names
 2013-04-24 09:11:52 +10:00
Tobias Preuss
d537193f26 Add auto-completion for zeus. 2013-04-23 10:41:58 +02:00
Tobias Sjösten
680302c9f6 Added 'jekyll' to list of bundled commands 2013-04-23 09:35:27 +03: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
Dustin Hemmerling
785b1c6337 mvn plugin was missing "redeploy" completion for tomcat. 2013-04-22 16:01:09 -07:00
Jeremy Attali
e41714d72c Added option to allow untracked files as non dirty 
In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
 2013-04-22 10:59:08 +02:00
Felipe Contreras
c944f8b465 gitfast: fix prompt 
Certain themes need the 'clean' mark, and some people like to have the
'dirty' one, just like the original git_promp_info().

We probably shouldn't be modifying that function, there's no other clean
way to achieve our own status information, so let's try to emulate the
original as much as possible.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2013-04-21 02:57:05 -05:00
Felipe Contreras
72a8c08cc8 gitfast: synchronize with upstream 
Up to version 1.8.2.1.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2013-04-21 02:57:05 -05:00
Felipe Contreras
d615f64374 git: fix parse_git_dirty() 
If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
 2013-04-21 02:56:39 -05:00
Ron Shapiro
bc385531b0 Separate the battery_pct_remaining data into it's own function so that it can be obtained even if the battery is connected. 2013-04-20 22:37:36 -04:00
Garami Gábor
a08f626f1c Adding undocumented clean command to completion 
Clean command is undocumented (not included in
bundle help output), however that is very useful,
especially in RVM environment you can clean up
outdated gems in gemset.
 2013-04-20 21:40:15 +02:00
Chris Borgia
52dc3b99f9 Edited Grammar in template file 2013-04-18 16:43:54 -04:00
jaseg
f2b915c567 The safe-paste plugin now works with tmux, too 2013-04-17 17:08:36 -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
bertabus
c50b9a24f1 Added Vundle clean to remove bundles removed from vimrc 2013-04-11 14:56:22 -06:00
Gaurav Misra
32a42f27b6 Escape spaces in folder name so script won't fail 
If the current directory has spaces, the script fails to change paths and fails.
 2013-04-09 11:45:16 -07:00
Marko Bauhardt
9c6b88607e a plugin (function) which copies the current directory into the clipboard 2013-04-08 22:11:22 +02: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
Bercio
6b6208e141 >! doesn't work with no clobber, echo is redundant. Fixed all. 2013-04-08 19:02:48 +08:00
Bercio
58a6ed1eac "$PWD" = "PWD", >! doesn't work, echo is redundant. Fixed all. 2013-04-08 18:45:45 +08:00
Alexis Hildebrandt
9af2295394 Add emoji-clock plugin 
which displays the current time with half hour accuracy as an emoji
symbol, for example in the shell prompt.
 2013-04-08 09:38:15 +02: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