Commit graph

1,085 commits

Author SHA1 Message Date
Gaetan Semet
aeef63985a new repo alias: rst for repo status
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-11-07 10:12:17 +01:00
Gaetan Semet
da8d0e41df fix ls --colors issue on macos
rely on zsh (see aliases files) for setting ls in color mode.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-31 01:50:39 +01:00
Gaetan Semet
acb27b2272 fixed ls aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-30 14:07:03 +01:00
Gaetan Semet
9ce2284550 new alias for _repo: ru
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-29 16:17:39 +01:00
Gaetan Semet
550ef0b3d2 Merge remote-tracking branch 'ysmood/master' 2013-10-29 15:38:40 +01:00
Yad Smood
1b4a7e3be9 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2013-10-27 12:45:44 +08:00
Gaetan Semet
62e40902ff Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
2013-10-25 16:03:23 +02: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
Gaetan Semet
a394bfe8ee Reworked Git aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-16 15:06:59 +02:00
Kaiwen Xu
c5902d3f34 Moved misplaced plugins. 2013-10-14 07:39:59 -04:00
Gaetan Semet
24bc161ed5 Merge remote-tracking branch 'upstream/master' 2013-10-09 16:09:25 +02: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
Hervé Cauwelier
b6751d842e activate virtualenvwrapper by default 2013-10-07 15:26:14 +02:00
Hervé Cauwelier
9d4a9be541 plugins/git: missing compdefs and new aliases 2013-10-07 15:26:14 +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
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
Yad Smood
ce8385f7bf add: plugins/zsh-syntax-highlighting. 2013-09-26 12:05:54 +08:00
Gaetan Semet
bd32698531 Merge remote-tracking branch 'upstream/master'
Conflicts:
	.gitignore
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	templates/zshrc.zsh-template
2013-09-24 14:30:27 +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
Stibbons
efb5c7f6c8 ls --color is not recognized under mac
Signed-off-by: Stibbons <gaetan@xeberon.net>
2013-09-18 00:10:37 +02:00
Gaetan Semet
e44d8c530e Merge remote-tracking branch 'upstream/master' 2013-09-11 15:32:01 +02:00
Gaetan Semet
33e9308703 gf is not git fetch, not git ls (=> gls)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-11 15:28:23 +02: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
Gaetan Semet
0d4892d4db new git stash aliases
Inspired by https://github.com/robbyrussell/oh-my-zsh/pull/2078/files

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:41:55 +02:00
Gaetan Semet
84b738e31c Merge branch 'gsemet_push_git_plugin'
Conflicts:
	plugins/git/git.plugin.zsh
2013-09-10 11:26:30 +02:00
Gaetan Semet
00f52bcc1b Minor changes in Git aliases
- change gr to git remote to git rebase. In a daily developement,
  for a typical developper, ther is more rebase than adding or
  removing branches. Thus, gr (for git remote) becomes gre, while
  gr becomes git rebase (gr = rebase, gra = abort rebase,
  grc = rebase continue)
- gf is for git fetch. new alias for --all: gfa
- gitk-entier-history is a magic alias for find lost/dandling
  commits without having to mess with git reflog

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:15:53 +02:00
Gaetan Semet
28c3ca4ead Merge remote-tracking branch 'bors-ltd/master'
Conflicts:
	README.textile
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
2013-09-10 11:00:09 +02:00