linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-19 20:29:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
3849 commits 1 branch 0 tags 141 MiB
Commit graph

2160 commits

Author SHA1 Message Date
Robby Russell
57c2ac1e60 Merge pull request #4482 from sachin21/add_an_alias_for_upstream 
Add an alias for upstream
 2015-10-10 07:12:21 -07:00
Robby Russell
ff1bd952a7 Merge pull request #4480 from volcov/master 
add alias to sort by version
 2015-10-10 07:11:39 -07:00
Satoshi Ohmori
7597bf805e Add an alias for upstream 2015-10-10 11:51:33 +09:00
Andrew Janke
2d0e7fbdad autoenv: actually source autoenv once located 
Fixes bug introduced in #4440
 2015-10-09 20:35:19 -04:00
Bruno Volcov
252078dd6c add alias to sort by version 2015-10-09 18:47:48 -03:00
Robby Russell
2522ab4504 Merge pull request #4204 from DoctorJellyface/patch-1 
Added --now systemd aliases
 2015-10-09 07:19:54 -07:00
Robby Russell
0be21f025e Merge pull request #4440 from apjanke/autoenv-homebrew 
autoenv: support homebrew-installed autoenv
 2015-10-09 07:18:02 -07:00
Robby Russell
dc06e96e9c Merge pull request #4254 from apjanke/copyfile-portability 
Cross-platform clipboard clipcopy() and clippaste()
 2015-10-09 07:15:53 -07:00
Robby Russell
b1173d4b30 Merge pull request #4418 from Gnouc/master 
Encode64 Plugin - Fix wrong `echo` usage
 2015-10-09 07:15:20 -07:00
Robby Russell
bb509dda23 Renaming colored-man to colored-man-pages because it needs to be. 2015-10-09 07:07:57 -07:00
Robby Russell
f3fa41834d Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2015-10-05 13:46:26 -07:00
Robby Russell
d26549b7ec Removing legacy rails-specific aliases from the Textmate plugin. This is probably best handled as a custom plugin. 2015-10-05 13:46:20 -07:00
Giordano Vicari
ee8f3771e9 Added support to subtask through gulp --tasks-simple command 2015-10-05 19:44:00 +02:00
Robby Russell
62c86f5c75 Merge pull request #4444 from apjanke/git-extras-compatibility 
git-extras: fix for compatibility with zsh _git
 2015-10-05 07:50:08 -07:00
Andrew Janke
b6d78df62c clip*: add xsel support 2015-10-05 05:13:11 -04:00
Kevin O'Neal
a95473919a Update Gradle Commands 2015-10-04 17:05:28 -05:00
Robby Russell
920ab071cb Merge pull request #4423 from gfvcastro/alias-rake-middleware 
Add 'rake middleware' alias.
 2015-10-03 14:37:29 -07:00
Robby Russell
bff88685b8 Merge pull request #4429 from RobLoach/removeatom 
Remove Atom plugin
 2015-10-03 14:36:14 -07:00
Robby Russell
867d586253 Merge pull request #4445 from wweaver/git-hf-aliases 
Add Git Hubflow aliases
 2015-10-03 14:34:20 -07:00
Robby Russell
80179c10be Merge pull request #4453 from uberspot/master 
Add 3 more nmap aliases to nmap plugin
 2015-10-03 14:33:35 -07:00
Robby Russell
30c7ef7d2b Merge pull request #4421 from jcpst/master 
gulp plugin: missing opening double quote
 2015-10-03 14:32:40 -07:00
Robby Russell
bd264980a5 Merge pull request #4424 from Gutem/patch-1 
Update Simulator's Path to XCode 7.x
 2015-10-03 14:32:12 -07:00
uberspot
df5e1f9c2c Add 3 more nmap aliases to nmap plugin 2015-10-03 19:37:12 +02:00
Victor Torres
d49cacfb7b Add branch plugin 2015-10-02 23:16:56 -03:00
Will Weaver
b35d78f2f8 Add Git Hubflow aliases 2015-10-02 08:14:06 -04:00
Andrew Janke
7f2656c126 git-extras: fix for compatibility with zsh _git 
This changes all the __git_* functions it was defining to __gitex_* to avoid collisions with the internal functions used inside _git from zsh.
 2015-10-02 03:18:28 -04:00
Andrew Janke
c146853a5e autoenv: also look in the Homebrew installation location for it 2015-10-01 19:29:59 -04:00
Andrew Janke
56b747aa89 Merge branch 'autoenv-check' of github.com:kudos/oh-my-zsh into autoenv-homebrew 2015-10-01 19:20:34 -04:00
Xavier Haniquaut
f9c16f940e Remove broken link and move npmg alias position 2015-09-30 16:42:46 +02:00
Rob Loach
0516a39dec Remove Atom plugin 
The Atom plugin is obsolete.

See #3193
 2015-09-29 12:16:18 -04:00
Xavier Haniquaut
df80081e9b Add alias for npm global install 2015-09-29 10:20:55 +02:00
Gutem
1e305e0186 Update Simulator's Path to XCode 7.x 2015-09-28 16:04:25 -03:00
Gustavo Villa
3e04cd62d3 Add 'rake middleware' alias. 2015-09-28 14:59:06 -03:00
Joseph Post
5af52fbc75 gulp plugin: missing opening double quote & had unneeded parens on function 2015-09-28 10:50:35 -05:00
Andrew Janke
e4fdb08365 Merge branch 'master' into copyfile-portability 2015-09-28 08:52:03 -04:00
LE Manh Cuong
758195cb79 Encode64 Plugin - Fix wrong echo usage 
Currently, encode64 plugin using `echo -n` to print the content
of $1 variable. This approach will not work with arbitrary data,
which contains sequence of escaped characters, since when many
`echo` implementation will expand them.

This commit chage the usage to `printf`, which is builtin in all
POSIX shells and can print arbitrary data reliability.
 2015-09-28 16:05:22 +07:00
Tyler Charlesworth
2266368b77 Update sublime.plugin.zsh 2015-09-27 16:51:38 -07:00
Robby Russell
b05ef1034f Merge pull request #4121 from apjanke/chucknorris-check-for-fortune 
chucknorris: check for fortune/strfile dependency
 2015-09-27 12:42:38 -07:00
Robby Russell
a51a9169a9 Merge pull request #4348 from andybateman/patch-1 
Display song currently playing in iTunes
 2015-09-27 12:40:31 -07:00
Robby Russell
9e291033d9 Merge pull request #4394 from PrestanceDesign/new-git-alias 
Add alias for print latest tag name
 2015-09-27 12:39:51 -07:00
Robby Russell
156fa5fa10 Merge pull request #4396 from TylerCharlesworth/patch-1 
Adds Cygwin support to Sublime
 2015-09-27 12:39:27 -07:00
Robby Russell
b75b0b8882 Merge pull request #4333 from mbologna/fedora_plugin 
Added fedora plugin, based on dnf/yum plugin
 2015-09-26 09:37:24 -07:00
Robby Russell
d47219fbce Merge pull request #4397 from vidakovic/master 
Accept single and double quotes in Gulp plugin
 2015-09-26 09:34:25 -07:00
Robby Russell
c932eb3f04 Merge pull request #4385 from Philosoft/patch-1 
Update README.md for vi-mode
 2015-09-26 09:33:33 -07:00
Robby Russell
4204cfd22f Merge pull request #4408 from DoomHammer/fix-chruby-test-expression 
Fix invalid test expression.
 2015-09-26 09:30:54 -07:00
Robby Russell
a97a308604 Merge pull request #4349 from FishingCactus/fix-atom_plugin_for_cygwin 
Fixed atom plugin for cygwin users
 2015-09-26 09:29:53 -07:00
Piotr Gaczkowski
17088c6431 Fix invalid test expression. 2015-09-25 22:53:40 +02:00
Aleksandar Vidakovic
0c0450b303 Accept single and double quotes in Gulp plugin 2015-09-24 11:51:15 +01:00
Tyler Charlesworth
07f08aa731 Adds Cygwin support 2015-09-24 01:25:22 -07:00
Michael SALIHI
8e74f7c1aa Add alias for print latest tag name 2015-09-24 02:22:50 +02:00
Alexander Frolov
e957ae4135 Update README.md 2015-09-23 09:54:22 +03:00
Chris McCuller
e6ccd37b05 Merge master (rebase being super annoying). Fix conflicts 2015-09-21 22:19:15 -04:00
Andy Bateman
326c2b0859 Replaced the use of 'print' with 'echo' in order to sanitise track and artist names 
Fixed indentation

Fixed indentation
 2015-09-22 08:15:31 +12:00
Andy Bateman
993e09cc6b Added function for 'itunes playing' to display state when not playing 2015-09-22 08:15:31 +12:00
Andy Bateman
9f2acdc445 You can now use 'itunes status' as well as 'itunes playing' to show current track 2015-09-22 08:15:31 +12:00
Andy Bateman
29db0e0119 Fixed colourisation of Now Playing function 2015-09-22 08:15:31 +12:00
Andy Bateman
a746e6010a Update osx.plugin.zsh 
Added function to display the song you're currently listening to in iTunes

Fixed indent

Indentation on line 169 was squiffy

Fixed spelling

Removed unnecessary wording to make function more succinct.

Highlighting of Artist and Track

Changed the highlighting of the Track and Artist in yellow to make use of Prompt Expansion Colors
 2015-09-22 08:15:22 +12:00
Michael SALIHI
1bb2715b22 Fix capistrano problem when generating autocompletion 2015-09-21 13:17:45 +02:00
Ramses Ladlani
f8502965e4 Added cygwin support to atom plugin 2015-09-21 09:18:43 +02:00
Robby Russell
cbc1a0806e Merge pull request #4342 from robobenklein/patch-1 
Fix Atom Plugin for Linux Users
 2015-09-19 09:39:13 -07:00
Robby Russell
25f2d59048 Merge pull request #4353 from dzotokan/feat/stackPlugin 
Add Haskell Stack commands list
 2015-09-19 09:38:48 -07:00
Robby Russell
4d65dd2404 Merge pull request #4310 from ablyler/add-codeclimate-plugin 
Add codeclimate autocomplete plugin
 2015-09-19 09:29:04 -07:00
Robby Russell
e268ef3a80 Merge pull request #4320 from ixti/fix/aws-plugin-rprompt-pollution 
Fix aws plugin RPROMPT pollution
 2015-09-19 09:23:18 -07:00
Robby Russell
b29095fe68 Merge pull request #4354 from henrikhodne/patch-1 
chruby: donʼt try to execute .sh files before loading
 2015-09-19 09:22:14 -07:00
Robby Russell
c4d84f1b77 Merge pull request #4343 from apjanke/jira-readme 
jira: add README.md
 2015-09-19 09:20:04 -07:00
Robby Russell
ce104579a8 Merge pull request #4370 from afh/pull/emotty_plugin 
Add emotty plugin
 2015-09-19 09:17:36 -07:00
Robby Russell
2dc980c8c0 Merge pull request #4331 from icholy/master 
golang: improve go doc completion
 2015-09-19 09:06:16 -07:00
Robby Russell
db14538853 Merge pull request #4315 from mbologna/fancy-ctrl-z 
Added Fancy-ctrl-z plugin
 2015-09-19 09:04:30 -07:00
Robby Russell
3b29132214 Merge pull request #4300 from igordejanovic/vim-escape-fname 
[vim-interaction plugin] Escape special chars in filenames.
 2015-09-19 09:04:17 -07:00
Robby Russell
cfba05cf9d Merge pull request #4282 from ferenczy/master 
Added missing commands to Vagrant plugin
 2015-09-19 09:03:40 -07:00
Robby Russell
ff3e0d530c Merge pull request #4266 from t413/master 
Bring bgnotify plugin up to date with t413/zsh-background-notify
 2015-09-19 09:03:29 -07:00
Robby Russell
4f1caf0955 Merge pull request #4237 from mcornella/fix-taskwarrior-plugin 
Fix taskwarrior plugin
 2015-09-19 09:01:28 -07:00
Robby Russell
6eb6017b3c Merge pull request #4235 from mcornella/fix-xcode-plugin 
Fix xcode plugin
 2015-09-19 09:01:16 -07:00
Robby Russell
1e49dfcd15 Merge pull request #4209 from ah450/npm-exec 
Adds npmE alias
 2015-09-19 09:00:54 -07:00
Robby Russell
075655563f Merge pull request #4201 from wkentaro/gnu-utils-findutils 
gnu-utils: add findutils (find,xargs,locate)
 2015-09-19 09:00:41 -07:00
Robby Russell
681c42ac46 Merge pull request #4154 from sfragis/toggle-sudo 
Esc-esc toggles sudo
 2015-09-19 08:59:29 -07:00
Robby Russell
f7c24e1808 Merge pull request #4137 from troter/coffee-first-argument-with-double-quote 
coffee: protect args with double-quote
 2015-09-19 08:59:13 -07:00
Robby Russell
544eccb5dd Fixing conflict in rails plugin merge with rake test shortcut 2015-09-19 08:58:24 -07:00
Robby Russell
04c8acf5de Merge branch 'rails-rake-test' of https://github.com/skv-headless/oh-my-zsh into skv-headless-rails-rake-test 2015-09-19 08:55:13 -07:00
Robby Russell
fb0776e1be Merge pull request #4134 from boddhisattva/rails-rake-routes-alias 
Adds an alias to search for the rails routes that pattern match a string
 2015-09-19 08:54:07 -07:00
Robby Russell
dde5540b1e Merge pull request #4093 from apjanke/osx-fix-tab-for-iterm 
osx: fix tab() functions so the cd works in iTerm2, and status/output are better
 2015-09-19 08:52:23 -07:00
Robby Russell
763bf6374c Merge pull request #3971 from moul/pr-scaleway 
Support for 'scw' command (Scaleway CLI)
 2015-09-19 08:51:21 -07:00
Robby Russell
baf1aa13cb Merge pull request #3661 from ericbottard/GradleWrapperFix 
Fix invocation of gradlew
 2015-09-19 08:48:41 -07:00
Robby Russell
3c782f78f1 Merge pull request #3582 from apjanke/fold-terminalapp-plugin-into-termsupport 
Fold terminalapp plugin in to lib/termsupport
 2015-09-19 08:48:03 -07:00
Robby Russell
4bd6c43cfb Merge pull request #3408 from spacewander/git-extras 
update git-extras plugin
 2015-09-19 08:47:13 -07:00
Robby Russell
93c6b5deb8 Merge pull request #3078 from akoenig/gulpjs 
gulp.js plugin
 2015-09-19 08:46:49 -07:00
Robby Russell
cc53e4cb99 Merge pull request #2471 from phstc/capistrano-multistage 
Adds support to capistrano multistage completion
 2015-09-19 08:45:43 -07:00
Alexis Hildebrandt
dce052dac0 Add emotty plugin 
which displays an emoji for the current $TTY.
 2015-09-18 14:24:46 +02:00
Henrik Hodne
8c5b948162 chruby: donʼt try to execute .sh files before loading 2015-09-16 15:28:08 +02:00
Daniel Stankevich
bb10ad0a13 Remove unnecessary sandbox fn 2015-09-16 17:25:39 +10:00
Daniel Stankevich
a8a8bc3967 Add simple Stack commands list 2015-09-16 17:18:27 +10:00
Tim O'Brien
e8639c700e Update to current robbyrussell/oh-my-zsh master 2015-09-14 15:39:18 -07:00
Tim O'Brien
797e1f9a64 [plugins/bgnotify] fix for iTerm2 notification clicks 2015-09-14 15:32:50 -07:00
Andrew Janke
c9af79fcad jira: add README, "emulate -L zsh", add "dumpconfig" action 
(The "dumpconfig" action is for verifying the configuration behavior against what's documented in the README now.)
add "error" to some of the error messages
 2015-09-11 18:37:39 -04:00
Andrew Janke
6642a99fac xcode: extend xcselv to list versions and do completion 2015-09-11 21:06:18 +02:00
Ilia Choly
22287d0153 handle multiple paths in GOPATH 2015-09-11 12:27:22 -04:00
Andrew Janke
36fea45bfc svn plugin: urldecode repo info 
The repo location reported by `svn` is a URL. If you don't decode it before using it a prompt, the `%` sequences will be misinterpreted by prompt expansion and give screwy results.
Fixes #2233
 2015-09-11 03:11:01 -04:00
Ben Klein
dca429557a Make Readme much clearer and explain edits. 
Also added some examples, but those should be mostly self-explanatory.
 2015-09-10 22:22:00 -04:00
Ben Klein
953e4d8926 Make Linux compatible 
Just an if/else to determine if we're OSX or Linux and alias `at` appropriately.
 2015-09-10 22:19:53 -04:00
Ilia Choly
9e9b790fe1 golang: improve go doc completion 2015-09-09 10:59:29 -04:00
Michele Bologna
6170fa41d9 Added fedora plugin, based on dnf/yum plugin 2015-09-09 11:42:56 +02:00
Marc Cornellà
82ae41ca4c Reorder xcode plugin file 2015-09-07 12:09:08 +02:00
Marc Cornellà
213f46a296 Add xcselv documentation in the README 2015-09-07 12:08:50 +02:00
Andrew Janke
5584aa05c7 xcode: add version-based xcselv() 2015-09-07 11:50:45 +02:00
Juraj Fiala
86d881c47d Added aliases for --now commands 
Also removed the old sc-launch alias because this is just better.
 2015-09-06 13:01:09 +02:00
Marc Cornellà
d95589d4e4 Add README for the xcode plugin 2015-09-05 23:17:38 +02:00
Marc Cornellà
ec3694c788 Make simulator dependant of currently active dev directory 
This also gets rid of `xcode-select` command-not-found errors.
 2015-09-05 22:47:52 +02:00
Marc Cornellà
24bdd8e29a Replace xcsel function with just an alias 2015-09-05 22:47:52 +02:00
Marc Cornellà
6a830f39b6 Return error if no xcode files where found 2015-09-05 22:47:52 +02:00
Marc Cornellà
cbdad588e6 Use zsh globbing instead of ls + grep in xc function 
Uses zsh arrays and globbing to find .xcworkspace and .xcodeproj files.
 2015-09-05 22:47:52 +02:00
Marc Cornellà
38d25a3359 Update taskwarrior completion to latest version (Jul 26 2015) 
See relevant commit at:
https://git.tasktools.org/projects/TM/repos/task/commits/3158883dc4d251
 2015-09-05 22:47:51 +02:00
Marc Cornellà
75844fe1a1 Put relevant documentation into README file 2015-09-05 22:47:51 +02:00
Alexey V Zapparov
7a63ccabf6 Fix aws plugin RPROMPT pollution 2015-09-04 21:18:32 +02:00
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
Pablo Cantero
c7d782f1ab Add the update from @mtwentyman https://github.com/phstc/dotfiles/pull/1 
to make it work for older versions of capistrano
 2015-09-03 13:39:41 -03:00
Chris McCuller
30ef856648 Fix maintainer line 2015-09-03 09:47:02 -04:00
Michele Bologna
9a7b2d7ffb Moved comments and credits from source to README 2015-09-03 08:55:03 +02:00
Michele Bologna
6d7c39a2ae Added fancy-ctrl-z plugin 
Use Ctrl-Z to switch back to Vim
I frequently need to execute random command in my shell. To achieve it I pause
Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.

The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
to Vim.
I could not find a solution, so I developed one on my own that works wonderfully
with ZSH.

Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
 2015-09-02 21:00:36 +02:00
Eric Bottard
ef4a315630 Fix invocation of gradlew 2015-09-02 20:17:03 +02:00
Andy Blyler
b08431ff74 Add codeclimate autocomplete plugin 2015-09-01 23:08:41 -04:00
Marc Cornellà
c481c62bc9 Refactor and clear up README file 2015-09-02 00:26:16 +02:00
Marc Cornellà
d982e1200f Reorder alias definitions 2015-09-02 00:26:15 +02:00
Marc Cornellà
663ac56d54 Prettify frontend help output and clean up logic 2015-09-02 00:26:14 +02:00
willmendesneto
ff706f3ef8 Add "help" method in "frontend-search" plugin 2015-09-02 00:26:13 +02:00
Marc Cornellà
f1472f1f64 Simplify frontend-search function with assoc array 
Also adds the lodash URL (which was missing) and uses https on those websites
that support it.
 2015-09-02 00:26:11 +02:00
Marc Cornellà
7f64092361 [vim-interaction plugin] Escaping special chars in file names and simplifying code. 2015-09-01 19:07:49 +02: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