Commit graph

3990 commits

Author SHA1 Message Date
ncanceill
d24196cfbd git plugin: fix ggl to avoid empty string
see
https://github.com/robbyrussell/oh-my-zsh/pull/2790#issuecomment-112716330
2015-06-17 22:38:31 +02:00
Arnaud Rinquin
ed6645a282 Fix plugin/git ggpull and ggpush backward compatibility
Current `ggpush` is `git push origin` instead of `git push origin $(current_branch)`
Same for `ggpull`
2015-06-17 22:36:25 +02:00
Michele Bologna
68b792bbb6 Change to use omz git_prompt* functions
Removed references for official git __git_ps1() functions.
Change to use omz function git_prompt* functions like:
- git_prompt_info() -> branch name
- git_prompt_status() -> check if untracked, modified, added,
  stashed file are in the current git repo
- git_remote_status() -> check if current repo is ahead, behind,
  or diverged.
These functions returns string automatically added to your PS1;
these are customizable via exporting ZSH_THEME_GIT_PROMPT*
2015-06-16 10:56:19 +02:00
ju
68e03a0592 Changed env based sf2 shortcuts to sfdev & sfprod 2015-06-16 08:44:50 +02:00
Andrew Janke
d0670aa2bd Fix merge conflict for jira-prefix and jira add comment 2015-06-15 16:55:25 -04:00
Robby Russell
ab18795f3c Merge pull request #4002 from aliafshar/patch-1
Add missing space causing parse error.
2015-06-15 08:52:59 -07:00
Michele Bologna
01e355fb1e In addition to the already existing variables ZSH_THEME_GIT_PROMPT for behind,
ahead and diverged remote, I added ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE.
2015-06-15 10:15:22 +02:00
Ali Afshar
f66a54fb78 Add missing space causing parse error. 2015-06-14 22:29:11 -07:00
Robby Russell
8921902388 Merge pull request #3852 from sachin21/add_alias_of_bundle_clean
Add alias of bundle clean
2015-06-14 22:28:33 -07:00
Robby Russell
5d214af6d2 Merge pull request #3858 from muchweb/muchweb-patch-1-editor
Use $EDITOR
2015-06-14 22:28:17 -07:00
Robby Russell
7daf7401b9 Merge pull request #3874 from diraol/patch-2
Debian Plugin: Differing upgrade and safe-upgrade
2015-06-14 22:27:59 -07:00
Robby Russell
0665ece7bd Merge pull request #3973 from moul/pr-boot2docker-update
Add new boot2docker options
2015-06-14 22:27:07 -07:00
Robby Russell
31b351ce4c Merge pull request #3947 from mkwmms/patch-1
Respect $ZSH_CACHE_DIR when creating fasd's cache
2015-06-14 22:26:28 -07:00
Robby Russell
0a8ca6adff Merge pull request #3918 from cbazin/master
Detect the .venv in any parent directory of the current directory
2015-06-14 22:19:23 -07:00
Robby Russell
b55effd3bb Merge pull request #3919 from delphij/history-extendedglob
Don't leak extendedglob to global environment.
2015-06-14 22:18:33 -07:00
Robby Russell
34d3680232 Merge pull request #3838 from forivall/hyphen-insensitive
Add hyphen insensitivity
2015-06-14 22:17:43 -07:00
Robby Russell
3a57076d93 Merge pull request #3813 from ziegs/fix_gradle_tasks
Fixes gradle autocomplete so it includes subproject tasks
2015-06-14 22:17:24 -07:00
Robby Russell
628c1fe1c0 Merge pull request #3848 from tristola/master
Added aliases for docker compose
2015-06-14 22:17:09 -07:00
Robby Russell
058def3b91 Merge pull request #3798 from dnixx/vundle-update
Use the newest Vundle commands
2015-06-14 22:16:34 -07:00
Robby Russell
5fba46a8c4 Merge pull request #3821 from tresni/fix_minimal
Fix minimal.zsh-theme's check for in_svn and add support for mercurial
2015-06-14 22:16:21 -07:00
Robby Russell
c0b283c76b Merge pull request #3833 from coopermaruyama/master
coffeescript aliases for easy compiling
2015-06-14 22:16:04 -07:00
Robby Russell
6a340d99fd Merge pull request #3988 from UserTaken/docker_update
Docker run and create options
2015-06-14 22:15:40 -07:00
Robby Russell
ea5ff03b92 Merge pull request #3759 from mikeokner/master
Adding quotes to git completion discovery path
2015-06-14 22:14:07 -07:00
Robby Russell
04c301bb3a Merge pull request #3975 from wernerb/patch-1
Set AWS_PROFILE and use existing RPROMPT
2015-06-14 22:10:18 -07:00
Robby Russell
a1e722d446 Merge pull request #3976 from rodrigoargumedo/patch-1
Add rdrs method to reset the database(s)
2015-06-14 22:09:46 -07:00
Robby Russell
422db48e37 Merge pull request #3986 from evilhamsterman/master
Only load url-quote-magic if it is available.
2015-06-14 22:09:13 -07:00
Robby Russell
3d2bf227ea Merge pull request #4001 from ivanfoo/fixOddCharsOnMac
Fixed odd chars on mac for agnoster theme
2015-06-14 22:01:07 -07:00
Robby Russell
a7784636d8 Merge pull request #3929 from GunfighterJ/GunfighterJ-patch-sublime3
Add sublime text 3 paths to check list
2015-06-14 22:00:32 -07:00
Robby Russell
78bbf7a6e5 Merge pull request #3809 from ncanceill/easymerge
Easy-to-Merge
2015-06-14 21:46:41 -07:00
ivanfoo
c6460ef3e7 Fixed odd chars on mac for agnoster theme 2015-06-15 00:25:22 +02:00
Mikhail S. Pobolovets
a7e79824f8 Add mix-fast plugin (similar to rake-fast)
Signed-off-by: Mikhail S. Pobolovets <styx.mp@gmail.com>
2015-06-14 17:41:56 +02:00
UserTaken
55b1a2befe Update _docker 2015-06-13 16:30:18 -07:00
Michael Okner
3d670c0bfc Adding quotes to git completion discovery path
Previously, spaces in the path would result in wto separate errouneous
paths being parsed. This fixes that issue.
2015-06-13 08:59:10 -05:00
Fräntz Miccoli
4cc0a2638c A paver (Python build and configuration utility) plugin 2015-06-13 11:06:26 +02:00
Marc Cornellà
26c7adf110 Revert "Added migration notification for rails plugin"
This reverts commit 1493d88e3f, made
to put a deprecated notice on rails3 and rails4 plugins, so that
users would migrate to the unified rails plugin.

It's been 1.5 years since that, so everyone should be migrated to
the good one.
2015-06-13 11:05:38 +02:00
Sriram Sundarraj
8b95bdb5e0 Added github in web_search plugin. 2015-06-13 11:04:02 +02:00
Christian Hoener zu Siederdissen
83295ec9bc last-working-dir working with spaces in dirnames 2015-06-13 11:00:58 +02:00
Tommy Wang
d0b690b584 use local options to set no_equals before sourcing bash completion script 2015-06-13 10:57:31 +02:00
Robby Russell
9eaf51107f Merge pull request #3990 from ncanceill/plugin-git
[HotFix] Git plugin
2015-06-12 08:17:36 -07:00
ncanceill
f1a43daa36 git plugin: new/changed aliases
gaa was brought back by popular demand — see #3535
gap was replaced with gapa — see #3682
gdc was replaced with gdca — see #3977
2015-06-12 11:50:30 +02:00
Filip Bartuzi
e55d84f76e Add reference to bundler plugin issue in README 2015-06-12 00:36:53 +02:00
Erlend Hamberg
763cef8013 Add leaves command to brew completion 2015-06-12 00:24:43 +02:00
Vadim
4b76b7429a remove trash command from osx plugin 2015-06-12 00:21:44 +02:00
wyldphyre
cf3fb873ec Added README.md file for ForkLift plugin 2015-06-12 00:17:26 +02:00
wyldphyre
81da07602c Added README.md file for atom plugin 2015-06-12 00:17:22 +02:00
wyldphyre
a2d7d36e70 Added README.md file 2015-06-12 00:17:17 +02:00
CkEsc
c28b226af2 Fix README.md for sst command 2015-06-12 00:14:59 +02:00
Daniel Campoverde [alx741]
0e35bd4001 Plugins: vi-mode: Add first README file 2015-06-12 00:08:26 +02:00
KhasMek
0f96e8e6c2 Plugins: archlinux - add basic README. 2015-06-12 00:03:55 +02:00
KhasMek
e5929680fd Plugins: archlinux - use command -v in favor of which
The command 'which' launches an external process that isn't
  really necessary.
2015-06-12 00:03:16 +02:00