1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-04 19:50:08 +00:00
Commit graph

6117 commits

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
bwl
aaf705c5fa Adding logic for ~/Applications folder installs of Sublime Text 2 2012-07-29 00:53:20 -04:00
Morgan Larosa
682961e930 Add a configuration option to disable autocorrect 2012-07-28 08:25:15 +10:00
Bjarki Ágúst Guðmundsson
75029cda2a Added a "please" alias for sudo 2012-07-26 17:54:15 +00:00
Bjarki Ágúst Guðmundsson
e709642f6f Merge branch 'master', remote-tracking branch 'rr/master' 2012-07-26 17:50:56 +00:00
oemer
9ee4b9c8f7 Added go completion script. Taken from /misc/zsh/go 2012-07-26 16:05:03 +02:00
apm
a8d7958729 alias at=aptitude broke /usr/bin/at scheduler.
Just an idea: change it to ap
2012-07-25 10:55:28 +06:00
James Smith
772bc51c3a Merge 2012-07-24 13:39:07 -07:00
fred-o
0ebeb56252 node completion 2012-07-24 16:16:55 +02:00
clutton
decb9c82b5 delete os specific disable-patterns 2012-07-24 14:16:03 +03:00
fred-o
b49c97e08e help command, node completion 2012-07-24 12:15:36 +02:00
Graham Christensen
61e708f91f Adding a symfony plugin, for symfony 1 2012-07-23 23:33:14 -04:00
clutton
d5bfbf05d1 improvement: define PROMPT_HOST once on startup 2012-07-24 05:36:18 +03:00
Dr Nic Williams
73df0c8e93 added 'gcl'for 'git config --list'; and gd for 'git diff' 2012-07-23 07:51:29 -07: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
Alexis GRIMALDI
1e1e0fa44d Fix changelog --list completion bug 2012-07-20 16:46:30 +02:00
Alexis GRIMALDI
46b88b6a5a Added credits 2012-07-19 13:01:32 +02:00
Alexis GRIMALDI
0b757825a2 Added git-extras completion 2012-07-19 12:50:53 +02:00
Andrew Vit
3fea7c3b27 Added avit theme 2012-07-19 03:03:18 -07:00
Andrew Vit
98ecfa4c77 Bwana plugin for reading man pages in Safari 2012-07-19 03:02:57 -07:00
Henry Yan
3fe1e5c787 add maven zsh autocomplete plugin, copy from juvenxu's bash maven autocomplete plugin 2012-07-18 23:37:21 +08:00
Mugen Kenichi
bb34abd518 check for knife.rb in cwd
this is useful when managing multiple chef servers
2012-07-18 12:07:16 +02:00
Henry Yan
4a11d2c35c merge from upstream master 2012-07-17 00:36:50 +08:00
Peter Tillemans
6756be7e5b Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2012-07-16 17:29:18 +02:00
clutton
6a2e04fefb modify themes/jnrowe.zsh-theme, add host directive "Ξ (mbsd) ~ →" 2012-07-16 02:59:30 +03: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
fred-o
e4ffac154d added _files values for certain options 2012-07-13 16:24:45 +02:00
fred-o
4caea1f7e1 completion options 2012-07-13 12:08:41 +02:00
fred-o
df176fb3dc added alias 2012-07-12 14:17:59 +02:00
fred-o
350720eca1 added completions for all known arguments to all known commands 2012-07-12 14:05:33 +02:00
Bob Maerten
5001412f6d vagrant uses 'ssh-config' command, not 'ssh_config' 2012-07-12 14:19:10 +03:00
Justin Caratzas
0b2da8f11b Add very basic virtualenv plugin
checks for $VIRTUAL_ENV and provides to basename in a function for the prompt.
2012-07-11 23:40:12 -04: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
fred-o
d2116f3557 apparently, this file must exist for the plugin to load 2012-07-10 14:57:59 +02:00
fred-o
4d0c135798 added completion for all asadmin subcommands 2012-07-10 14:54:11 +02: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
jais
8d60f9a0d8 Fix the rvm gemset right prompt:wq 2012-07-03 15:12:55 +10:00
jaischeema
c23392ac5b Add new theme : jaischeema 2012-07-03 13:02:29 +10: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
mapc
1b36c1beae Remove debug info 2012-06-30 05:37:10 +02:00