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

1097 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Caio Romão
a3c2a2f6e8 Add branch status support to git_prompt_status 
This patch makes git_prompt_status support three new status variables:

 - ZSH_THEME_GIT_PROMPT_AHEAD
 - ZSH_THEME_GIT_PROMPT_BEHIND
 - ZSH_THEME_GIT_PROMPT_DIVERGED

With these extra variables it's easy to see (1) if you have commits in
your local branch that weren't pushed to the remote (AHEAD), (2) if
there are commits in the remote that you haven't merged/rebased yet
(BEHIND) or (3) if you have local unpushed commits AND the remote has
some commits you haven't merged yet (DIVERGED).

Refer to the first line displayed on `git status -b --porcelain`.

An example setup in a .zsh-theme file would be:

ZSH_THEME_GIT_PROMPT_AHEAD="↑"
ZSH_THEME_GIT_PROMPT_BEHIND="↓"
ZSH_THEME_GIT_PROMPT_DIVERGED="↕"
 2012-07-29 20:18:26 +02:00
Robby Russell
d05b2010ff Merge pull request #1229 from seban/run_rails_without_bundle_exec 
'rails' command should not be run with bundle exec
 2012-07-20 15:15:05 -07:00
Robby Russell
1c23a52f57 auto-upadate feature will now reset the epoch so that if a user doesn't say yes, it won't ask them again for a while. fixes #1240 2012-07-20 15:07:51 -07:00
Sebastian Nowak
87ab8771da 'rails' command should not be run with bundle exec 
http://blog.wyeworks.com/2011/12/27/bundle-exec-rails-executes-bundler-setup-3-times
http://yehudakatz.com/2011/05/30/gem-versioning-and-bundler-doing-it-right/
 2012-07-15 21:26:30 +02:00
Robby Russell
11034217a7 Merge pull request #1200 from andyfleming/master 
New theme af-magic.zsh-theme
 2012-07-11 16:52:33 -07:00
Robby Russell
11f441a3ac Merge pull request #1206 from Eustachy/upstream 
Remove bogus "-" from nomz="ps -aux" alias.
 2012-07-09 19:36:53 -07:00
Robby Russell
ddafaf65fb Merge pull request #1216 from joshvermaire/patch-1 
Escape whitespace for Sublime Text plugin
 2012-07-09 19:34:03 -07:00
Josh Vermaire
a15bcd6461 utilize sublime's embedded command line binary 2012-07-09 00:11:07 -07:00
Josh Vermaire
92b6cae026 escape whitespace 2012-07-08 23:34:27 -07:00
Robby Russell
0370de582b Merge pull request #1122 from varunkvv/master 
sublime pluginn : Added alias for Sublime Text 2 on Linux
 2012-07-03 06:28:36 -07:00
Robby Russell
76feafc72c Merge pull request #1127 from a-b/master 
Added fasd plugin
 2012-07-03 06:28:02 -07:00
Robby Russell
e5ca18a4e2 Merge pull request #1193 from bameda/master 
[Plugin] Virtualenvwrapper: Added another path
 2012-07-03 06:27:31 -07:00
Robby Russell
f3bcf864b2 Merge pull request #1209 from lwe/rbfu-plugin 
provide plugin for rbfu (yet ruby version switcher)
 2012-07-03 06:26:24 -07:00
Robby Russell
beadefcfb0 Merge pull request #1170 from dipth/master 
Explicitly tell rbenv to use zsh
 2012-07-03 06:25:53 -07:00
lukas
e3ff4b58c6 provide plugin for rbfu the ruby version switcher 
Evaluates $(rbfu --init --auto) if rbfu is installed on the system,
also has a custom rbfu-rubies method which lists the installed
rubies which are available to rbfu.

For compatibility with themes, also creates the rvm_prompt_info
function, so existing themes should work out of the box.
 2012-07-03 09:59:42 +02:00
Eustachy Kapusta
e2ddf1ef8c Remove bogus "-" from nomz="ps -aux" alias. 
Info from http://procps.sourceforge.net/faq.html .
 2012-07-01 20:13:59 +02:00
Alexander Berezovsky
34f3d4d498 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2012-06-28 13:37:00 -07:00
David Barragan
d15ec4bf24 Added another path 2012-06-25 10:55:23 +02:00
Robby Russell
d165a84dc0 Merge pull request #1190 from vpacher/master 
added jruby plugin
 2012-06-24 12:36:15 -07:00
Robby Russell
1425ffe85c Merge pull request #1192 from rcakirerk/a39c9ffe5b7236b6e4dc78efa80b478cc411af7f 
Fix finding git issue.
 2012-06-24 12:35:48 -07:00
Renan Cakirerk
a39c9ffe5b Fix finding git issue. http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script 2012-06-23 14:58:04 +03:00
Volker Pacher
5c37c85fb4 added jexec 2012-06-22 18:33:11 +01:00
Volker Pacher
3aa0cb74d0 added plugin for jruby 2012-06-22 18:27:21 +01:00
Robby Russell
3ac3141cd6 Merge pull request #1174 from insside/rbenv-homebrew-fix 
rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
 2012-06-22 06:39:28 -07:00
Robby Russell
493238e29b Merge pull request #1126 from natsumesou/fix-ignore-symlink 
Load symlink custom files
 2012-06-22 06:38:41 -07:00
Robby Russell
a2695630cd Merge pull request #1182 from jugyo/patch-1 
correct the ruby version label of the 'nebirhos' theme for rbenv
 2012-06-22 06:37:23 -07:00
Robby Russell
bf98a2d68b Merge pull request #1159 from kristi/master 
Steef theme - Improved git untracked file detection
 2012-06-22 06:36:58 -07:00
Robby Russell
470e1a1ecf Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix 
Readlink is different on OS X
 2012-06-22 06:35:49 -07:00
Robby Russell
17c77ee20a Merge pull request #1168 from r-darwish/yum-plugin-fix 
Fixed unmached " in yum plugin
 2012-06-22 06:33:51 -07:00
jugyo
7e1da28d27 correct the ruby version label for rbenv 2012-06-21 07:41:50 +09:00
Andy Fleming
98d7a01099 theme cleanup 2012-06-20 13:26:05 -07:00
Andy Fleming
b97cc939ec added first version of my theme af-magic 2012-06-20 13:17:41 -07:00
Tima Maslyuchenko
5931f64308 sanitized code according to coding style 2012-06-18 21:29:24 +03:00
Tima Maslyuchenko
e9a9deacb0 rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder 2012-06-18 20:15:57 +03:00
James Walker
82f785bc67 remove readlink call and clean up 2012-06-18 10:41:19 -04:00
Alexander Berezovsky
4a2e9ed039 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2012-06-18 12:16:36 +03:00
Thomas Dippel
823cc9180c Explicitly tell rbenv to use zsh 
According to @graywh's comment on:
https://github.com/sstephenson/rbenv/issues/185
 2012-06-16 12:41:44 +02:00
Roey Darwish Dror
c65a53df81 Fixed unmached " in yum plugin 2012-06-15 10:07:22 +03:00
Robby Russell
e8d582aba9 Merge pull request #977 from scialex/better-d 
Make the 'd' alias only show the directories that can be cd'd to using the number aliases.
 2012-06-13 13:25:00 -07:00
Robby Russell
e3d426dc6d Merge pull request #980 from vmalloc/dircycle_plugin 
Add dircycle plugin: enables cycling through the directory stack
 2012-06-13 13:24:13 -07:00
Robby Russell
38d537f9e7 Merge pull request #984 from vmalloc/less_r_pager 
Pager is 'less -R' to support colored outputs
 2012-06-13 13:22:33 -07:00
Robby Russell
b84d336672 Merge pull request #985 from pomaxa/master 
git plugin function
 2012-06-13 13:21:13 -07:00
Robby Russell
f60244f8f4 Merge pull request #999 from ChaosData/master 
Auto title now disabled in emacs term mode
 2012-06-13 13:20:42 -07:00
Robby Russell
7bb2744873 Merge pull request #1016 from fuksito/master 
Helpers for encoding/decoding base64
 2012-06-13 13:19:07 -07:00
Robby Russell
edc8b1e2cc Merge pull request #1032 from r-darwish/suse 
Added suse plugin
 2012-06-13 13:18:37 -07:00
Robby Russell
7d9ae4cdb1 Merge pull request #1055 from daniellockard/patch-1 
Added an if-statement to see if git is installed
 2012-06-13 13:17:24 -07:00
Robby Russell
d297524bf5 Merge pull request #1065 from ntpeters/patch-1 
Added more aliases for yum
 2012-06-13 13:15:15 -07:00
Kristi
4d6b532248 add --directory flag 2012-06-13 13:14:31 -07:00
Robby Russell
00c8e332a2 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2012-06-13 13:14:28 -07:00
Robby Russell
4199c1a6f7 Updating README to ask people to stop sending themes for now 2012-06-13 13:14:23 -07:00