Commit graph

2,020 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
042ee6e6ed Merge pull request #2138 from Profpatsch/theme-agnoster
More expressive symbols for git and mercurial.
2013-10-24 20:28:22 -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
6533dc6b41 Merge pull request #2184 from jmagnusson/agnoster_respect_venv_disable_prompt
Fix: Agnoster theme doesn't respect VIRTUAL_ENV_DISABLE_PROMPT
2013-10-24 20:23:15 -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
Jacob Magnusson
0f9db24f9f Fix: Agnoster theme added venv name even if disabled
See http://www.virtualenv.org/en/latest/index.html\?highlight\=virtual_env_disable_prompt\#activate-script for info regarding this.
2013-10-20 16:07:19 +02:00
Kaiwen Xu
c5902d3f34 Moved misplaced plugins. 2013-10-14 07:39:59 -04:00
futjikato
7e452c41c0 Updated completion to work with comma seperated list 2013-10-13 21:28:23 -07:00
futjikato
f05b1f0738 Added gitignore plugin ( for gitignore.io ) 2013-10-13 21:28:23 -07: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
Robby Russell
a7b2ca50ab Revert "Replace no unicode glyph on hexa string"
This reverts commit baffc3b0bd.
2013-10-13 21:28:22 -07:00
Maxime Chaisse-Leal
482dadf727 Added WIP alert to the gallois' theme 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
David Strawn
bf9bdec336 Fixed comments in zshrc.zsh-template about disabling auto updates.
Previously they did not make sense nor were they accurate.
2013-10-13 21:28:22 -07:00
Gaetan Semet
053544da1c Display right prompt in theme chooser
I didn't found the way to right-align the right prompt
properly.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
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
Mr Prud
85eb7d6d52 Replace no unicode glyph on hexa string 2013-10-13 21:28:21 -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
yleo77
ba760f4f8d add search by filename and file content feature 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
Kaiwen Xu
a7693b096f gitignore fix for custom folder. 2013-10-13 15:49:24 -04: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
Robby Russell
bbe4ea54fd Merge pull request #2139 from deiga/patch-1
Added '.war' extension to unzip
2013-10-08 19:25:17 -07:00
Robby Russell
a8efe61d53 Merge pull request #2145 from futjikato/master
Added gitignore.io custom plugin
2013-10-08 19:24:27 -07:00
futjikato
9afb139d20 Updated completion to work with comma seperated list 2013-10-05 00:56:17 +02:00
futjikato
33b1a3bcfe Added gitignore plugin ( for gitignore.io ) 2013-10-04 22:29:33 +02: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
Profpatsch
fa85b4d6ee More expressive symbols for git and mercurial. 2013-10-02 23:24:21 +02: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
61e3951e4b Revert "Replace no unicode glyph on hexa string"
This reverts commit baffc3b0bd.
2013-09-19 13:18:16 -07:00
Robby Russell
b57118bd37 Merge pull request #2065 from prudprud/master
Replace no unicode glyph on hexa string
2013-09-19 07:00:16 -07:00