Commit graph

1466 commits

Author SHA1 Message Date
Peter Tillemans 370dbe4fc7 Merge branch 'master' of github.com:ptillemans/oh-my-zsh 2012-08-13 14:07:58 +02:00
Bodo Tasche 36b42017ae new forklift plugin 2012-08-12 09:20:57 +02:00
Peter Tillemans 1a6d11dbae Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2012-08-08 17:26:54 +02:00
Sean M. Collins 74faabbcab Add shortcut for showing log of all branches 2012-08-07 14:38:48 -04:00
Yannik Stein 9172b3a89f fix typo in cd-wrapper 2012-08-05 22:51:11 +03:00
Alexis Letessier 9af7f86299 Correct variable used for global ssh known host completion 2012-08-01 23:58:09 +02:00
Ted Vessenes 027fcccc92 Make git use sha when branch name is missing. 2012-07-31 13:27:40 -04:00
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
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
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
clutton decb9c82b5 delete os specific disable-patterns 2012-07-24 14:16:03 +03: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 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
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
Peter Tillemans cc98254b62 Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh 2012-06-26 11:13:45 +02: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
Roey Darwish Dror f7b1615b7c Added completion to the theme selection plugin 2012-06-22 20:43:39 +03:00
Roey Darwish Dror 5e9a16b88a Added themes plugin 2012-06-22 20:43:39 +03:00
Volker Pacher 5c37c85fb4 added jexec 2012-06-22 18:33:11 +01:00