1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-30 01:30:08 +00:00
Commit graph

1907 commits

Author SHA1 Message Date
Andrew Janke
93b4a6c02e Merge branch 'master' into osx-fix-tab-for-iterm
Conflicts:
	plugins/osx/osx.plugin.zsh
2015-09-03 13:05:24 -04:00
Robby Russell
0532860c61 Merge pull request #4285 from nmaggioni/master
'ip' command compatibility and much quicker external IP detection
2015-08-31 22:21:25 -07:00
Robby Russell
7366b5677e Merge pull request #4268 from ZhengzhongZhang/patch-1
Plugin vundle: update link
2015-08-31 22:20:53 -07:00
kyleheyne
022a060ec7 thefuck-alias -> thefuck --alias
Per warning message.
2015-08-31 17:36:41 -04:00
Robby Russell
ba5fd57c1f Merge pull request #3989 from eubenesa/master
Updates to ember-cli plugin
2015-08-30 22:14:25 -07:00
Robby Russell
a77e23a0f9 Merge pull request #4109 from zhiyelee/patch-1
add git alias `gcam` -  git commit -am
2015-08-30 21:52:07 -07:00
Robby Russell
da6ece4ec9 Merge pull request #4117 from nextgenthemes/patch-1
Adds agar = apt-get autoremove
2015-08-30 21:51:50 -07:00
Robby Russell
eb12ec1dc8 Merge pull request #4146 from perobertson/heroku-help
[heroku] add '--help' as an option to commands
2015-08-30 21:50:22 -07:00
Robby Russell
ac85faa262 Merge pull request #4171 from linux-china/master
Spring Boot Plugin
2015-08-30 21:49:51 -07:00
Robby Russell
c1bff7798a Merge pull request #4195 from jerryling315/master
Add 'man' plugin.
2015-08-30 21:49:07 -07:00
Robby Russell
3f95377676 Merge pull request #4198 from matjack1/gclean-gpristine
git plugin: make gclean safer, introduce gpristine
2015-08-30 21:48:36 -07:00
Robby Russell
daabe2a008 Merge pull request #4205 from mcornella/fix-git-prompt-plugin
Fix git-prompt plugin
2015-08-30 21:48:14 -07:00
Robby Russell
c10d5c8b7c Merge pull request #4244 from Gnouc/master
Emoji plugin - Fix wrong string comparison
2015-08-30 21:47:42 -07:00
Robby Russell
69a17150ad Merge pull request #4239 from yous/fix-linux-gems
rvm plugin: Fix `gems` to work on Linux machine
2015-08-30 21:47:26 -07:00
Robby Russell
adff369c05 Merge pull request #4220 from andytank123/master
Add support for Docker images from custom registries
2015-08-30 21:47:09 -07:00
Robby Russell
2f6d85d64e Merge pull request #4248 from gabetax/rbenv_plugin_load_performance
reduce rbenv plugin load time by 150ms by removing additional brew call
2015-08-30 21:42:35 -07:00
Robby Russell
51c3ab7d76 Merge pull request #4283 from hanschen/master
Update autojump plugin for latest brew installation
2015-08-30 21:42:00 -07:00
Robby Russell
14e1f0c6d8 Merge pull request #4286 from RobinDaugherty/rand-quote-failure
Rand-quote plugin overflows stack when site is unreachable
2015-08-30 21:40:26 -07:00
Robby Russell
9c9699dcf5 Merge pull request #4250 from mcornella/fix-divide-by-zero-emoji
Fix divide by zero in emoji plugin
2015-08-30 21:38:09 -07:00
Robby Russell
6346cc9ba9 Merge pull request #4260 from fgibaux/patch-1
plugin symfony2 sf2.7 compatibility fix
2015-08-30 21:36:46 -07:00
Robby Russell
c084a13df2 Merge pull request #4259 from apjanke/jira-prefix-and-help-and-stuff
jira: prefix variable dashboard, default action, and completion
2015-08-30 21:36:06 -07:00
Robby Russell
e59f4cb14f Merge pull request #4271 from loctauxphilippe/patch-1
added apt-get autoremove in ubuntu plugin
2015-08-30 21:35:18 -07:00
Robby Russell
50d329450e Merge pull request #4289 from moonfruit/master
Remove redundant semicolon
2015-08-30 21:33:26 -07:00
Robby Russell
869b1046a4 Merge pull request #4292 from cxbig/master
improved alias conflict between git flow & git fetch
2015-08-30 21:32:45 -07:00
Robby Russell
a7aed69d02 Merge pull request #4170 from black-roland/master
The Fuck plugin (https://github.com/nvbn/thefuck)
2015-08-30 09:12:07 -07:00
Will Mendes
0a80889848 Frontend-search: add search in npm website 2015-08-29 11:48:28 -03:00
cxbig
acf6039ff3 improved alias conflict between git flow & git fetch 2015-08-29 01:35:41 +02:00
MoonFruit
0a2c31fb60 Remove redundant semicolon
Remove redundant semicolon to make tab() works better in ITerm 2.
2015-08-28 10:46:45 +08:00
Niccolò Maggioni
d923cebdb3
Updated with @mcornella suggestions 2015-08-27 11:34:53 +02:00
Robin Daugherty
96aefd2b98 Remove code, not comment it out
Gaaah.
2015-08-26 14:12:42 -04:00
Robin Daugherty
241be2d28b Fix rand-quote failure when site is unreachable
This plugin was designed so that if there is any failure, it will simply call itself recursively. Which means that if you were working offline, if `quote` was called in your `.zshrc`, you would be unable to open a new terminal session.

I fixed this by allowing the plugin to output nothing if a quote could not be fetched.
2015-08-26 13:24:59 -04:00
Niccolò Maggioni
058bbe4f02
General compatibility 2015-08-26 10:54:08 +02:00
Niccolò Maggioni
a127c4f88e
'ip' command compatibility and much quicker external IP detection 2015-08-26 10:48:01 +02:00
Hans Chen
1bf5c587a5 Update autojump plugin for latest brew installation 2015-08-25 17:05:28 -04:00
Philippe Loctaux
aaf5c8f43f added apt-get autoremove in ubuntu plugin
I use that command a lot of times, and there's no shortcut for that.
Now it does :)
2015-08-21 16:05:54 +02:00
章正中
1aeebf60a0 Update link 2015-08-21 14:28:03 +08:00
fgibaux
a9daea17d8 plugin symfony2 sf2.7 compatibility fix
with symfony 2.7 command group titles are listed as commands. this commit prevents it.
2015-08-18 14:19:40 +02:00
Andrew Janke
dc42e8d488 jira: add completion 2015-08-18 05:05:54 -04:00
Andrew Janke
7cf892ecaa Add dashboard support and default-action configuration.
Some refactoring.
2015-08-18 04:49:10 -04:00
Andrew Janke
ee4a423da5 Merge branch 'pr-4158' into jira-prefix-and-help-and-stuff 2015-08-18 04:12:35 -04:00
Andrew Janke
caf667fb30 Merge branch PR 4132 into jira-prefix-and-help-and-stuff 2015-08-18 04:10:56 -04:00
Kentaro Wada
c4ba3065a1 Show tag name when detached status if possible 2015-08-17 18:22:27 +09:00
Marc Cornellà
be667a24b0 Remove obsolete comment 2015-08-17 01:05:37 +02:00
Marc Cornellà
3c698743fa Clean up gitstatus.py 2015-08-16 23:21:48 +02:00
Kentaro Wada
45473c3a81 Fix for initial or detached status branch info 2015-08-16 23:02:17 +02:00
Marc Cornellà
30bed07e9c Parse UTF-8 output from git status 2015-08-16 23:02:16 +02:00
Kentaro Wada
94007f7db2 git-prompt: collect all git status information by one cmd
This commit uses the `git status --porcelain -b` format to gather the
number of ahead and behind commits related to the remote branch.
2015-08-16 23:02:15 +02:00
Marc Cornellà
6ff53d173b Cleanup of git-prompt plugin file 2015-08-16 23:02:14 +02:00
Marc Cornellà
1d133ff11f Cleanup the rest of gitstatus.py 2015-08-16 23:02:13 +02:00
Marc Cornellà
5642014ff1 Pull in simplified version from @wkentaro
This version uses `git status --porcelain` instead of making
multiple calls to `git status`.
2015-08-16 23:02:12 +02:00