Commit graph

983 commits

Author SHA1 Message Date
Andrew Schwartzmeyer
0259e4bb78 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
2013-10-31 02:26:51 -07:00
Robby Russell
90c28b786a Merge pull request #1688 from mbauhardt/z
ohmyzsh plugin of the z project: https://github.com/rupa/z
2013-10-24 20:29:10 -07:00
Robby Russell
9f88fb5229 Merge pull request #2165 from kevinxucs/custom-gitignore-fix
gitignore fix for custom folder.
2013-10-24 20:26:20 -07:00
Robby Russell
e44c147e25 Merge pull request #1963 from shajra/pr/gpg-fix
fix gpg-agent "running already" check
2013-10-24 20:25:33 -07:00
Robby Russell
86d57e83ed Merge pull request #2078 from tbuehl/master
Add commonly used git stash aliases to git plugin
2013-10-24 20:24:59 -07:00
Robby Russell
07ad2bad66 Merge pull request #2192 from kevintraver/tmux-aliases
Add tmux aliases
2013-10-24 20:23:40 -07:00
Robby Russell
8f2e53c33e Merge pull request #2107 from maxd/master
Check bundler version to avoid error with unsupported command line arguments
2013-10-24 13:13:10 -07:00
Kevin Traver
d01ca03635 Add tmux aliases 2013-10-23 23:17:43 -07:00
Kaiwen Xu
c5902d3f34 Moved misplaced plugins. 2013-10-14 07:39:59 -04:00
Timo Sand
a27160a623 Added '.jar' 2013-10-13 21:28:22 -07:00
Timo Sand
d88350fd4c Added '.war' extension to unzip 2013-10-13 21:28:22 -07:00
kaving
0d5981a1ad Add support for ForkLift 2 to the ForkLift plugin
The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
2013-10-13 21:28:22 -07:00
Maxime Chaisse-Leal
241966f2ae Added WIP (work in progress) feature to git.plugin 2013-10-13 21:28:22 -07:00
Thomas Hipp
b1a4c437e0 jump plugin: fix autocompletion with single mark
Autocompletion fails if there's only one mark, since the ls command
will not display the parent directory with the trailing colon.
Handling the single mark case separately and validating the symlink
explicitly, resolves the issue.
2013-10-13 21:28:22 -07:00
Paul Melnikow
65d1ebd493 Sublime Text: Harmonize alias with the Sublime Text install instructions
The typical command is `subl`, not `st`. Leaving both for backward compatibility.

See http://www.sublimetext.com/docs/2/osx_command_line.html
2013-10-13 21:28:22 -07:00
Paul Melnikow
5b36ff4073 NVM: Avoid providing completions when nvm is not installed 2013-10-13 21:28:22 -07:00
Paul Melnikow
89ed36595d Plugin for Node Version Manager 2013-10-13 21:28:22 -07:00
Alexander Gronemann
1b0346fa17 Update bundler.plugin.zsh
Added taps to bundled_commands
2013-10-13 21:28:22 -07:00
dchusovitin
ada59c81dd Fixed opening documentation on Linux (node) 2013-10-13 21:28:21 -07:00
Aaron Mills
8d4293facd Add support for mosh (remote-shell) tab completion. 2013-10-13 21:28:21 -07:00
Brandon W Maister
564a4011e1 Improve pip plugin options support
* -r, --record now looks for a local file instead of trying to cache
  the entire package index
* add --editable because it's useful
* add --single-version-externally-managed because it is too long
* add --record and --root because they're required by
  --single-version-externally-managed
2013-10-13 21:28:21 -07:00
yleo77
e8abe81aed set default value --max-count=10 2013-10-13 21:28:21 -07:00
Tehmasp Chaudhri
923335c820 Added a 'git diff --cached' alias -> 'gdc' 2013-10-13 21:28:21 -07:00
yleo77
c514d390ec add some alias for git flow 2013-10-13 21:28:21 -07:00
yleo77
9b007d71e0 add gf alias for git flow 2013-10-13 21:28:21 -07:00
Joni Chandra
2d38e49096 Update the wrong variable used in rb20 function. Fixes #1762
Signed-off-by: Joni Chandra <joniliciously@gmail.com>
2013-10-13 21:28:21 -07:00
Robby Russell
c79e5a97a9 Merge pull request #2132 from jkaving/forklift2
Add support for ForkLift 2 to the ForkLift plugin
2013-10-08 19:26:28 -07:00
Timo Sand
671db71d21 Added '.jar' 2013-10-03 13:00:12 +03:00
Timo Sand
387de3a57e Added '.war' extension to unzip 2013-10-03 09:48:49 +03:00
kaving
2be4158d8f Add support for ForkLift 2 to the ForkLift plugin
The ForkLift plugin now supports ForkLift 2 as well as ForkLift 1.
If ForkLift is not running it also waits for it to be running before
trying to switch to the specified directory
2013-10-02 10:51:21 +02:00
Maxim Dobryakov
e8c3619486 Check bundler version to avoid error with unsupported command line arguments 2013-09-24 13:58:48 +04:00
Robby Russell
0582bd193c Merge pull request #1763 from jonilicious/master
RVM plugin - Fixes wrong variable used in 'rb20' function
2013-09-19 06:58:51 -07:00
Robby Russell
26e936e645 Merge pull request #1967 from tchaudhri/gdc_git_alias
Added a 'git diff --cached' alias -> 'gdc'
2013-09-19 06:56:58 -07:00
Robby Russell
4275e68bb3 Merge pull request #2079 from paulmelnikow/subl
Sublime Text: Harmonize alias with the Sublime Text install instructions
2013-09-19 06:56:35 -07:00
Robby Russell
9d93608740 Merge pull request #2077 from paulmelnikow/nvm
Plugin for Node Version Manager
2013-09-19 06:52:42 -07:00
Robby Russell
ea4d3367b9 Merge pull request #2060 from dchusovitin/bug-node-doc
Fixed opening documentation on Linux (node)
2013-09-19 06:50:05 -07:00
Robby Russell
91c9d98bd8 Merge pull request #2066 from agronemann/patch-1
Update bundler.plugin.zsh
2013-09-19 06:49:28 -07:00
Robby Russell
d5701784b0 Merge pull request #2098 from monstermunchkin/master
jump plugin: fix autocompletion with single mark
2013-09-19 06:48:13 -07:00
Robby Russell
d72ebc0824 Merge pull request #2043 from quodlibetor/fix-pip
Improve pip plugin options support
2013-09-18 23:39:59 -07:00
Robby Russell
fc70d76788 Merge pull request #2053 from fluxrad/mosh
Add support for mosh (remote-shell) tab completion.
2013-09-18 23:39:12 -07:00
Robby Russell
a712579a2a Merge pull request #2099 from mchaisse/master
Added WIP (work in progress) feature to git.plugin
2013-09-18 23:38:11 -07:00
yleo77
0240ac6496 Merge remote-tracking branch 'robbyrussell/master' 2013-09-19 12:40:45 +08:00
Maxime Chaisse-Leal
095a01d92a Added WIP (work in progress) feature to git.plugin 2013-09-18 21:54:23 +02:00
Thomas Hipp
91b6a6b5a4 jump plugin: fix autocompletion with single mark
Autocompletion fails if there's only one mark, since the ls command
will not display the parent directory with the trailing colon.
Handling the single mark case separately and validating the symlink
explicitly, resolves the issue.
2013-09-18 17:13:12 +02:00
Andrew Schwartzmeyer
56cd862c2c Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/tmux/tmux.plugin.zsh
2013-09-15 18:42:07 -07:00
Robby Russell
b51c2a0d0b Merge pull request #1987 from zvirusz/patch-1
Added 'reinstall' command to brew completion
2013-09-11 06:20:22 -07:00
Robby Russell
045323160a Merge pull request #2002 from stibinator/master
added duckduckduck go to the web-search plugin
2013-09-11 06:20:10 -07:00
Robby Russell
e99a8fb9c2 Merge pull request #2080 from Mehonoshin/bundler-parallel-installing
Support of parallel bundle install
2013-09-11 06:16:30 -07:00
Robby Russell
cf4eded921 Merge pull request #1975 from fff/master
fix typo error in tmux plugin
2013-09-11 06:15:26 -07:00
Jeroen Janssens
d3e005d6b4 Fix aliasing pwd 2013-09-06 15:29:14 -04:00