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

2096 commits

Author SHA1 Message Date
Robby Russell
44c7fd976b Merge pull request #1928 from dongweiming/add-hist-stamp
Add option for show in the command execution time stamp in the history
2013-12-02 23:38:26 -08:00
Robby Russell
f574849c0a Merge pull request #1927 from dongweiming/modify
Modify determine the oh-my-zsh installed in non-default path of the installed
2013-12-02 23:37:49 -08:00
Robby Russell
533e31f2cc Merge pull request #1956 from emesix/patch-1
Update jonathan.zsh-theme
2013-12-02 23:32:56 -08:00
Robby Russell
3ff772d68b Merge pull request #2022 from Zhann/master
Updates Zhann theme
2013-12-02 23:30:25 -08:00
Robby Russell
bbadcf77e3 Merge pull request #2034 from kasperisager/master
Add Pure theme
2013-12-02 23:27:45 -08:00
Robby Russell
b38db4a2d2 Merge pull request #2097 from natecox/master
Added virtualenv plugin data to af-magic theme.
2013-12-02 23:26:03 -08:00
Robby Russell
b6f4a887ac Merge pull request #2131 from stevschmid/patch-1
Fix gallois theme
2013-12-02 23:24:01 -08:00
Robby Russell
4fc0806123 Merge pull request #1030 from solnic/master
[themes/josh] Use $(current_branch) in prompt
2013-12-02 23:21:41 -08:00
Robby Russell
7a6caf679a Merge pull request #950 from sonicradish/master
sonicradish - 256 color oh-my-zsh theme [dark/solarized]
2013-12-02 23:19:10 -08:00
Robby Russell
1badb744bf Merge pull request #948 from excepttheweasel/master
Added peepcode theme
2013-12-02 23:18:31 -08:00
Robby Russell
1c185f0055 Merge pull request #946 from rach/master
Little tweak on the robbyrussell.zsh-theme
2013-12-02 23:17:25 -08:00
Robby Russell
4954335b64 Merge pull request #781 from pilif/two-lined-pygmalion
make pygmalion theme use two lines when needed
2013-12-02 23:15:19 -08:00
Robby Russell
2a43c5eebd Merge pull request #684 from masnick/master
Update to fino.zsh-theme
2013-12-02 23:11:10 -08:00
Robby Russell
07594af171 Merge pull request #639 from MarcoPeraza/git_unpushed
Show if you're ahead of remote in the wedisagree theme
2013-12-02 23:08:37 -08:00
Robby Russell
273728901e Merge pull request #513 from randy909/fix-edit-cmdline
Fix edit-command-line binding
2013-12-02 23:03:03 -08:00
Robby Russell
3d6f9d78c5 Merge pull request #306 from jtriley/git-prompt
add git-prompt plugin from olivierverdier/zsh-git-prompt
2013-12-02 22:49:08 -08:00
Robby Russell
7f3e56f8d6 Merge pull request #2198 from Larandar/master
[PLUGINS] Brew: Add "options" as a valide first argument
2013-12-02 22:45:55 -08:00
Robby Russell
182652b00a Merge pull request #2202 from kevinxucs/themes-random
themes plugin now picks a random theme if no argument is provided.
2013-12-02 22:43:52 -08:00
Robby Russell
9a40ae9b5f Merge pull request #2212 from bsiegel/bundler_bi_function
Change bundler plugin's `bi` alias to a function
2013-12-02 22:42:50 -08:00
Robby Russell
e25329fcf6 Merge pull request #2222 from jamesoff/fix-battery-plugin
Prevent errors in prompts if no battery info available.
2013-12-02 22:39:45 -08:00
Robby Russell
fb614a0e80 Merge pull request #2229 from prubianes/master
Bazaar Integration Lib
2013-12-02 22:37:28 -08:00
Robby Russell
9357f2f41d Merge pull request #2236 from Isquariel/nvm
Added function to show current Node.js version and new Bureau theme
2013-12-02 22:35:41 -08:00
Robby Russell
ac838345f5 Merge pull request #2270 from michaelorr/slow-git-fix
Optionally disable git_prompt_info with git config option for very large repos
2013-12-02 22:28:11 -08:00
Robby Russell
5589741506 Merge pull request #2272 from TuiKiken/master
Add update statistics when people upgrade
2013-12-02 22:21:58 -08:00
Robby Russell
7ee3b27bdd Merge pull request #2292 from Atem18/master
Just forgot 3 letters. Here is the fix.
2013-12-02 22:19:44 -08:00
Brandon Siegel
22c0db64ee Change bi alias to a function
Only check the bundler version when we call bi. This fixes two issues:
First, if there is no bundler available system-wide this will cause an
error each time zsh loads. Second, if new bundler is installed
system-wide but you change into an rbenv with an older version, the
alias will no longer work.
2013-12-02 10:51:25 -05:00
Atem18
06bd72f842 Merge remote-tracking branch 'upstream/master' 2013-12-01 23:45:55 +01:00
Kevin Messer
84e178fa3d Fixed lines 32, 33, 34 where one 'p' was missing in 'zypper' command. 2013-12-01 23:29:55 +01:00
Robby Russell
5643fac887 Merge pull request #2290 from jtinfors/master
Adds the hgsl alias for one-line shortlog convenience
2013-12-01 13:53:40 -08:00
Robby Russell
270b1dc689 Merge pull request #2242 from sztupy/fix-mvn-color-locale
Fix issues with special characters when running mvn
2013-12-01 13:53:24 -08:00
Robby Russell
1b337af758 Merge pull request #2252 from henrique2010/master
new useful aliases for zeus
2013-12-01 13:52:16 -08:00
Robby Russell
259daa08af Merge pull request #2254 from Atem18/master
Rebranded SUSE's plugin according to Zypper's official alias
2013-12-01 13:51:47 -08:00
Robby Russell
401c82a8c8 Merge pull request #2286 from ych/master
Add FreeBSD support for autojump plugin
2013-12-01 13:50:48 -08:00
Robby Russell
d51cb6d385 Merge pull request #2260 from Stibbons/gsemet_push_sublime3_support2
Add support for sublime 3
2013-12-01 13:49:19 -08:00
Robby Russell
b6c6a5a5e6 Merge pull request #2285 from dhruvasagar/master
Added Amuse zsh theme
2013-12-01 13:48:34 -08:00
Robby Russell
7a27a1ce77 Merge pull request #2240 from Kriechi/master
unified and improved Rails plugin -- consolidates Rails3 and Rails4 plugins into one.
2013-12-01 13:33:00 -08:00
Jens Tinfors
96bd365542 Adds the hgsl alias for one-line shortlog convenience 2013-12-01 15:33:23 +01:00
Thomas Kriechbaumer
1493d88e3f Added migration notification for rails plugin 2013-12-01 15:31:48 +01:00
Robby Russell
14005be445 Merge pull request #2249 from pabrahamsson/obsd_colorls
Add support for colored ls output on OpenBSD
2013-11-30 11:08:29 -08:00
Robby Russell
f078e03743 Merge pull request #2275 from wjv/wjv
Use precmd hook instead of chpwd for updating OS X proxy icon
2013-11-30 11:06:21 -08:00
ych
699c82eb89 Add FreeBSD support for autojump plugin 2013-11-29 18:34:12 +08:00
Dhruva Sagar
3d851daf45 Added Amuse zsh theme 2013-11-29 12:28:52 +05:30
Robby Russell
66a33b80c3 Merge pull request #2261 from webframp/feature/chruby-plugin
Add simple plugin for chruby ruby version manager
2013-11-24 10:46:58 -08:00
Robby Russell
fabe23bbfc Merge pull request #2259 from eddiemonge/patch-1
standardize logic blocks
2013-11-24 10:36:50 -08:00
Robby Russell
370ccc359d Merge pull request #2266 from ssm/plugin/pyenv
Add pyenv plugin
2013-11-24 10:35:57 -08:00
Robby Russell
81f9f3ca1a Merge pull request #2271 from ashleyh/master
fix pip plugin
2013-11-24 10:32:19 -08:00
Robby Russell
83462b3bff Merge pull request #2273 from thibaudgg/patch-1
Update _heroku config arguments (Heroku Client v3)
2013-11-24 10:31:38 -08:00
Robby Russell
7cf34f5c34 Merge pull request #2276 from christianschmidt/master
Update _pass to follow symlinks for completion
2013-11-24 10:30:35 -08:00
christianschmidt
ec779d5f73 Update _pass to follow symlinks for completion
Based on: http://comments.gmane.org/gmane.comp.encryption.pass/235
2013-11-23 15:32:22 +01:00
Johann Visagie
d12113a9e8 Use precmd hook for updating OS X proxy icon
Using the chpwd hook function causes some junk to be printed to STDOUT after
returning from a subshell wherein the working directory was changed. In rare
cases, this can cause issues with 3rd party tools. An example is this issue
with the Python virtualenvwrapper tool:

https://bitbucket.org/dhellmann/virtualenvwrapper/issue/216/lsvirtualenv-and-workon-output-broken-in
2013-11-22 14:59:04 +01:00