1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-27 06:41:58 +00:00
Commit graph

4295 commits

Author SHA1 Message Date
Marc Cornellà
9df79bc21a Merge pull request #4773 from mbologna/patch-1
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
2016-01-13 16:35:25 +01:00
Michele Bologna
87f8251388 Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE
Re-added $ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE variable which was removed in 9f55213
2016-01-13 15:36:59 +01:00
L.C. Karssen
0a47451a46 Updated colour of ◀ in PROMPT2 of the avit theme.
In commit 729fd53 I incorrectly only changed PROMPT1. Now both ▶ and ◀ follow $CARETCOLOR.
2016-01-13 10:00:32 +01:00
L.C. Karssen
63e216ba9d oh-my-zsh avit theme: instead of only showing the last 3 directories in the $PWD shorten the path by removing some middle parts if $PWD becomes too long. 2016-01-13 10:00:32 +01:00
L.C. Karssen
18801e25d2 Shorter way of creating bold colours in a ZSH theme (applied to the avit theme). 2016-01-13 10:00:32 +01:00
L.C. Karssen
ceca00a503 Adapt some colours in the avit theme for better visibility in the default Ubuntu terminal theme. 2016-01-13 10:00:32 +01:00
L.C. Karssen
854c41d843 Fix in avit theme: $CARETCOLOR was not to actually colour the caret, so change to root user wouldn't show in the prompt. 2016-01-13 10:00:32 +01:00
L.C. Karssen
a67dfae72b Set colour for user@hostname to red if we're root (or sudo) in the bira theme. 2016-01-13 10:00:32 +01:00
Andrew Janke
9dd8def169 forklift: update homepage URL and tweak formatting 2016-01-08 23:35:22 -05:00
Stefan Wrobel
3dfd2166fa chruby plugin locals moved inside function 2016-01-07 17:31:03 -08:00
Marc Cornellà
686e460258 Merge branch 'sachin21-a_happy_new_year'
Close #4740
2016-01-04 17:30:11 +01:00
Marc Cornellà
03cc1f74f3 Cleanup LICENSE file and fix README link 2016-01-04 17:29:23 +01:00
Satoshi Ohmori
fdde897deb Update year to 2016 2016-01-04 22:18:17 +09:00
Satoshi Ohmori
06659f7fc1 Support bundler 2015-12-25 19:54:12 +09:00
atk91
d853ec4b62 Closes #4727 2015-12-25 11:33:29 +03:00
Marc Cornellà
f558a460c2 Merge pull request #4709 from mcornella/fix-local-vars-in-git-prompt
Put `local var` declaration in its own line in lib/git.zsh
2015-12-17 21:45:50 +01:00
Marc Cornellà
0842384987 Put local var declaration in its own line in lib/git.zsh
In places, the local statement will override the exit code and the written
command won't have the effect intended when it was written.

For example, when it's not inside a git repo the exit code won't be true,
but the local statement will make it true regardless. See #4708.
2015-12-17 18:37:49 +01:00
Marc Cornellà
30ddf25fd7 Merge pull request #4695 from mcornella/add-hub-completion
Add hub's completion file
2015-12-16 12:34:03 +01:00
Marc Cornellà
69c73a477c Merge pull request #4704 from paulcalabro/patch-1
Fixed a typo.
2015-12-16 09:37:55 +01:00
Paul Calabro
247a582d09 Fixed a typo. 2015-12-15 22:52:13 -07:00
Marc Cornellà
5adb06df0e Merge pull request #4702 from prikhi/master
colored-man-pages: Use Portable `less` Path
2015-12-15 21:46:39 +01:00
Pavan Rikhi
3ebbb40b31 colored-man-pages: Use Portable less Path 2015-12-15 15:13:19 -05:00
Marc Cornellà
6ad6d114dc Merge pull request #4700 from giordanovi/master
Update gulp.plugin.zsh
2015-12-15 12:17:46 +01:00
Giordano Vicari
015437cab8 Update gulp.plugin.zsh
Remove `local` stuff that cause an error in shell
2015-12-15 12:14:41 +01:00
Marc Cornellà
3162de563f Add hub's completion file
This uses the version at commit 35c76bf (2015-12-08)
35c76bf91d
2015-12-15 11:57:24 +01:00
Marc Cornellà
4b95c166bd Merge branch 'fix-colored-man-pages-syntax' 2015-12-15 11:56:27 +01:00
Marc Cornellà
5e310c5308 Fix syntax error in colored-man-pages
Commit 09d2a597a5 introduced the bug, which is due to using
single brackets conditions at the same time as *.

This commit should fix it and use double brackets everywhere
else.

Fixes #4699
2015-12-15 11:56:16 +01:00
Marc Cornellà
fe9ff63ced Merge pull request #4463 from giordanovi/master
Fetch Gulp tasks list in a better way
2015-12-15 11:44:59 +01:00
Giordano Vicari
4f314e2a32 Update gulp.plugin.zsh
Add local stuff
2015-12-15 11:41:36 +01:00
Giordano Vicari
8042394c78 Update gulp.plugin.zsh
Sort pipe dropped and fix 2>/dev/null
2015-12-15 11:14:25 +01:00
Marc Cornellà
cb11d139b4 Merge pull request #4697 from psprint/master
znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2
2015-12-15 11:03:14 +01:00
Sebastian Gniazdowski
d30a501b1c znt: more optimizing workarounds for 5.0.6 <= zsh < 5.2 2015-12-15 11:02:10 +01:00
Marc Cornellà
5de1704a0a Merge branch 'cknoblauch-patch-1'
Close #4469
2015-12-15 04:12:01 +01:00
Marc Cornellà
09d2a597a5 Fix style of colored-man-pages plugin 2015-12-15 04:11:40 +01:00
cknoblauch
a8157293a7 colored-man plugin: Quoted PATH variable
Some environments (in my case, cygwin) have PATH variables with directories
with spaces in them, breaking colored-man.
Adding quotes around the PATH environment variable makes the plugin run OK.
2015-12-15 04:06:23 +01:00
Marc Cornellà
dd299542c9 Merge branch 'hallabro-consistent-wording-update'
Close #4103
2015-12-15 03:47:18 +01:00
Robin Hallabro
18ca953f12 Use consistent wording when updating
When the user is asked to update oh-my-zsh it says "[Oh My Zsh] Would
you like to check for updates? [Y/n]:". When the user agreed to update
the next text would say "Upgrading Oh My Zsh" which is inconsistent
with the question.
2015-12-15 03:46:46 +01:00
Marc Cornellà
ef31d06426 Merge pull request #4139 from ultimatemonty/patch-1
Nicer formatting of ember aliases in README
2015-12-15 03:37:44 +01:00
Marc Cornellà
8a3b78e011 Merge pull request #4536 from alexws54tk/patch-1
Update frontcube.zsh-theme
2015-12-15 03:26:19 +01:00
Marc Cornellà
e344f4c066 Merge pull request #4420 from apjanke/git-move-current_branch-to-core
Git: move current_branch() to core
2015-12-15 02:34:59 +01:00
Andrew Janke
9f552130bd Move current_branch() from git plugin to core lib/git.zsh
Fixes #4085: core -> plugin dependency issue.
Rename it to git_current_branch for clarity that it's git-specific.
Update all plugins that were calling it to use new name.
Fix variable leaks by making more variables in lib/git.zsh local.
Have lib/git.zsh use [[ ]] instead of [ ] everywhere.
2015-12-14 20:28:37 -05:00
Marc Cornellà
bfd2d8de24 Merge pull request #4498 from gfvcastro/alias-rake-stats
Add 'rake stats' alias.
2015-12-15 02:21:51 +01:00
Marc Cornellà
8d6fccef81 Merge pull request #4589 from apjanke/agnoster-powerline-char-stronger-warning
agnoster theme: stronger warning about changing SEGMENT_SEPARATOR character
2015-12-15 02:08:45 +01:00
Marc Cornellà
93c00cced5 Merge pull request #4451 from victor-torres/branch-plugin
Add branch plugin
2015-12-15 01:02:49 +01:00
Marc Cornellà
d988ee01c2 Merge pull request #4568 from blueyed/archlinux-improve-commands-lookup
archlinux: use $+commands instead of 'command -v' in a subshell
2015-12-15 01:01:47 +01:00
Victor Torres
fe63ed09b7 Updating speed test info and using zsh command line. 2015-12-14 20:58:29 -03:00
Victor Torres
cf5db83fac Implementing mcornella's suggestions in pull request 4451. 2015-12-14 17:39:26 -03:00
Marc Cornellà
531789e4fa Merge pull request #4628 from moyamo/master
Default to using terminfo to set the terminal title
2015-12-14 13:02:31 +01:00
Marc Cornellà
bd384a060b Merge pull request #4667 from dbohdan/patch-1
"fishy" theme: Shorten path .foo to .f, not .
2015-12-14 12:46:14 +01:00
Danyil Bohdan
b15918d414 "fishy" theme: Fix "~" use in prompt
Actually replace the value of the environment variable $HOME with
"~" instead of appending the tilde in front of the prompt.
2015-12-14 13:38:28 +02:00