Commit Graph

1830 Commits

Author SHA1 Message Date
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
Marc Cornellà
6443626a6b Pull in latest version from olivierverdier/zsh-git-prompt 2015-08-16 23:02:11 +02:00
Robby Russell
192de6bcff Merge pull request #4238 from wubaiqing/master
Add Baidu support to web-search plugin
2015-08-12 21:16:37 -07:00
Robby Russell
1605d8264c Merge pull request #4234 from mcornella/fix-fbterm-autostart
Fix fbterm autostart
2015-08-12 21:16:19 -07:00
Robby Russell
20f536c064 Merge pull request #4228 from mcornella/fix-virtualenvwrapper-quotes
[virtualenvwrapper] Add quotes to support folders with whitespace
2015-08-12 21:14:44 -07:00
Robby Russell
b8dbd9bfba Merge pull request #4217 from mcornella/standard-open-command
Implement and use a standard, cross-platform open command
2015-08-12 21:14:27 -07:00
Robby Russell
4c1eda114d Merge pull request #4216 from gkze/master
Add terraform completion
2015-08-12 21:13:39 -07:00
Robby Russell
e3a01e5af1 Merge pull request #4212 from NAR8789/master
Fix chpwd clobbering in dirhistory and last-working-dir
2015-08-12 21:12:58 -07:00
Robby Russell
45d640baee Merge pull request #4200 from lislon/systemd-patch
Add alias for "systemctl cat" and "systemctl edit"
2015-08-12 21:11:33 -07:00
Robby Russell
8c3d4a9826 Merge pull request #4095 from kd35a/master
Use 'quit all' instead of counting needed quits
2015-08-12 21:10:53 -07:00
Robby Russell
afc36e2710 Merge pull request #2446 from fallwith/emoji_plugin
Emoji plugin
2015-08-12 21:02:46 -07:00
Robby Russell
c45fff1f81 Merge pull request #2367 from andrew-dwyer/n98-magerun
New plugin for the n98-magerun Magento command line tool
2015-08-12 21:01:42 -07:00
wubaiqing
9caa215a2f Add Baidu support to web-search plugin 2015-08-10 11:41:48 +08:00
Marc Cornellà
be10229659 Exit only if the fbterm session closed correctly
This prevents the previous behavior that exitted the zsh session
even if fbterm didn't start correctly.
2015-08-09 22:45:02 +02:00
Marc Cornellà
be5dcb8a59 Check if fbterm is installed and use $TTY variable 2015-08-09 21:55:52 +02:00
Marc Cornellà
ccb0ae5720 Add quotes to support folders with whitespace 2015-08-07 22:45:46 +02:00
Marc Cornellà
b760a10cb2 Use standard open command in fasd and lighthouse plugins 2015-08-05 01:18:42 +02:00
Marc Cornellà
d1d06b5675 Use standard open command in current plugins
Substitutes the current duplicate logic for the standard
and cross-platform function open_command in plugins:

  frontend-search, jira, node, web-search
2015-08-05 00:57:40 +02:00
xiao.fan
cddfc3b038 style fixes 2015-08-04 15:10:18 -07:00
Florin Patan
cf78586f15 Update to latest Terraform release 0.6.1 2015-08-04 21:54:01 +02:00
gkze
7f3e6143ec Add terraform completion 2015-08-04 11:42:28 -07:00
xiao
aac5523629 Additional chpwd clobbering fix for dirpersist 2015-08-03 22:58:29 -07:00
xiao
084792b829 Don't clobber chpwd 2015-08-03 22:10:24 -07:00
Boris Avdeev
5554207279 Add alias for "systemctl cat" and "systemctl edit" 2015-07-31 15:05:07 +03:00
Robby Russell
3d5b3430fd Merge pull request #4122 from apjanke/venvw-treat-git-repo-as-venv-again
virtualenvwrapper: Treat git repos as project roots again
2015-07-29 08:01:33 -07:00
Andrew Janke
9a397254da Remove redundant comments from the .zsh file (since they're in README now). 2015-07-15 17:16:59 -04:00
Andrew Janke
6d618ef70e emoji plugin: generate char map from Unicode UTR51 data files
Refactor the functions and group listings to have fewer functions,
but have them take group names as parameters.
Pull group definitions in to a single associative array.
2015-07-15 17:07:33 -04:00
Robby Russell
a207a38d63 Merge pull request #4099 from moncho/master
Plugin now uses completion script from docker-compose repo.
2015-07-14 15:54:15 -07:00
Robby Russell
3ea3384186 Merge pull request #4041 from apjanke/fix-jira-prefix-comment-merge
Fix jira plugin syntax error due to merge conflict
2015-07-06 09:33:43 -07:00
Andrew Janke
f73e642e22 virtualenvwrapper: treat git repos as project roots again (instead of requiring a .venv customization directory)
Change error output to more conventional OMZ format, so it's clear the plugin is for oh-my-zsh and not base zsh.
Use `local` variables instead of manual unsetting.
2015-07-02 21:57:15 -04:00
Andrew Janke
c1f1f91daa virtualenvwrapper: Replace "realpath" with portable zsh-native :A and :h modifiers 2015-06-29 18:55:58 -04:00
moncho
0950f9c56d Plugin now uses completion script from docker-compose repo. 2015-06-28 11:16:17 +02:00
Fredrik Strandin
546b99ad4c Use 'quit all' instead of counting needed quits 2015-06-26 15:47:00 +02:00
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
Andrew Janke
d0670aa2bd Fix merge conflict for jira-prefix and jira add comment 2015-06-15 16:55:25 -04: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
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