Commit graph

937 commits

Author SHA1 Message Date
Gaetan Semet
e646ee6caa Merge remote-tracking branch 'upstream/master'
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/repo/repo.plugin.zsh
2013-06-26 17:24:11 +02:00
Chris Krycho
f25e2d2856 Add more capable hg incoming and outgoing count handling
The original hgic and hgoc aliases worked well for the default path, but attempting to call them with a different path failed. I created functions to handle them instead.
2013-06-25 15:52:26 -03:00
Robby Russell
b9baf37739 Merge pull request #1859 from ayushs/plugin-git-clean
Added alias for git clean
2013-06-25 09:26:00 -07:00
Robby Russell
a8c0c4de06 Merge pull request #1864 from Stibbons/gsemet_push_git_plugin
Improvement in the git plugin
2013-06-25 09:25:38 -07:00
Robby Russell
3a3fd686ee Merge pull request #1865 from Stibbons/gsemet_push_repo_plugin
New plugin for git-repo (https://code.google.com/p/git-repo/)
2013-06-25 09:24:25 -07:00
Robby Russell
e727068cee Merge pull request #1867 from telser/master
Simple Cabal plugin
2013-06-25 09:23:36 -07:00
Robby Russell
6e3e07fd90 Merge pull request #1869 from lucasuyezu/env_logs
Adding testlog and prodlog in addition to devlog.
2013-06-25 09:23:08 -07:00
Robby Russell
e8c7b77db9 Merge pull request #1880 from posva/rand-quote
Random quotes from the internet
2013-06-25 09:22:10 -07:00
Robby Russell
5bccf4b123 Merge pull request #1876 from chriskrycho/patch-1
Add count for incoming and outgoing changesets.
2013-06-25 09:21:32 -07:00
Robby Russell
7655a655f6 Merge pull request #1881 from iammichiel/patch-1
Adding a rebase option to git alias.
2013-06-25 09:21:15 -07:00
Robby Russell
11b7155469 Merge pull request #1886 from tresni/patch-5
Correctly detect JIRA Rapid Board
2013-06-25 09:14:59 -07:00
Robby Russell
bf2a85c397 Merge pull request #1901 from geecu/autocomplete_required
autocomplete required packages as second argumet
2013-06-25 09:13:57 -07:00
Robby Russell
0868d71307 Merge pull request #1708 from tessi/extend_mercurial_plugin
extend mercurial plugin
2013-06-25 09:13:26 -07:00
Robby Russell
1e625b42ff Merge pull request #1903 from andschwa/tmux_iterm2
Tmux iTerm2 integration
2013-06-25 09:08:49 -07:00
Robby Russell
354211f5ac Merge pull request #1904 from oohlaf/gpg-agent-fix
Prevent starting multiple gpg-agents
2013-06-25 09:07:49 -07:00
Robby Russell
c88121149a Merge pull request #1910 from dongweiming/add-celery-completion
Add celery completion
2013-06-25 09:05:30 -07:00
dongweiming
a18fa83550 Add celery completion 2013-06-25 22:06:24 +08:00
Gaetan Semet
b77ccd7c8f Merge remote-tracking branch 'upstream/master' 2013-06-25 15:39:23 +02:00
Olaf Conradi
64fc125eba Typo 2013-06-23 12:25:35 +02:00
Olaf Conradi
711e96b1a2 Prevent starting multiple gpg-agents
Don't just overwrite the environment. First check for a running agent (an
x-session might have one running). If no agent is found, source the
environment and check again using those settings. If again no agent is
found, start a new instance.
2013-06-23 11:34:03 +02:00
Andrew Schwartzmeyer
55f7990607 Not loading home tmux confs when iTerm2 tmux integration is enabled 2013-06-22 18:20:11 -07:00
Andrew Schwartzmeyer
bc65443734 Adding support for iTerm2 tmux integration via option '-CC' 2013-06-22 18:20:11 -07:00
Robby Russell
c888cd15a2 Merge pull request #1873 from charlesjohnson/bundler-plugin
Update bundler.plugin.zsh
2013-06-21 07:11:25 -07:00
Robby Russell
32b4755b8a Merge pull request #1889 from jerolimov/patch-1
osx-plugin: Do not clear new tab when calling it with an argument.
2013-06-21 07:07:07 -07:00
Gunther Konig
85c43f8a89 remove unused function 2013-06-21 12:38:17 +03:00
Gunther Konig
decf9cdb31 autocomplete required packages as second argumet 2013-06-21 12:21:25 +03:00
Gaetan Semet
8515794096 New plugins: pep8, autopep8, trial (twisted) and pylint
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 15:46:16 +02:00
Gaetan Semet
31f1e2202a Merge remote-tracking branch 'upstream/master' 2013-06-18 11:54:16 +02:00
Gaetan Semet
e6fc584464 compdef for git plugin 2013-06-18 11:49:55 +02:00
Gaetan Semet
95310800ff Merge remote-tracking branch 'kipanshi/master' (git alias)
Conflicts:
	plugins/git/git.plugin.zsh
2013-06-18 11:47:28 +02:00
Gaetan Semet
91dc73d411 Renamed alias gf to gls (git-ls)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 11:41:17 +02:00
Gaetan Semet
404a7e8eca Merge remote-tracking branch 'ysmood/master' (highlighter)
Conflicts:
	tools/upgrade.sh
2013-06-18 11:29:25 +02:00
Gaetan Semet
9465462828 New aliases for repo
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 11:28:42 +02:00
Gaetan Semet
175bab45ef Merge remote-tracking branch 'bors-ltd/master' (git alias)
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
	tools/upgrade.sh
2013-06-18 11:26:55 +02:00
Robby Russell
f63de87e07 Merge pull request #1894 from codewhale/master
debian plugin: ignore alias in sudo/aptitude check
2013-06-16 11:50:11 -07:00
Code Whale
4eace8753b debian plugin: ignore alias in sudo/aptitude check 2013-06-16 13:25:29 +08:00
Jeremy Tennant
f8e3f293e0 Add new plugin for homebrew installed version of postgres 2013-06-16 14:04:02 +10:00
Christoph Jerolimov
b074886ae6 Do not clear tab when calling it with an argument. 2013-06-14 01:36:37 +03:00
Gaetan Semet
60f4ae1bed Merge remote-tracking branch 'cadusk/master'
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2013-06-13 17:13:13 +02:00
Gaetan Semet
0a4553a16c Merge remote-tracking branch 'upstream/master' 2013-06-13 17:07:17 +02:00
Robby Russell
c73047e296 Merge pull request #1877 from spazm/virtualenvwrapper-cleanup
virtualenvwrapper plugin cleanup
2013-06-12 19:27:59 -07:00
Brian Hartvigsen
bab1800ded Correctly detect Rapid Board
* Add "x" in front of the value we check against...
* Use true instead of yes (more consistent with the rest of ohmyzsh)

The fact that no one seems to have raised this as an issue leads me to believe it's not used that much...
2013-06-12 12:22:47 -05:00
Gaetan Semet
c71471ce98 New cuting edges aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 15:47:03 +02:00
Gaetan Semet
4ca1f0fd8b New aliases for git
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 15:46:41 +02:00
Gaetan Semet
7591b56b9d Better super-grep
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 11:54:08 +02:00
Gaetan Semet
8e8acbd428 Merge branch 'gsemet_push_common_aliases' of https://github.com/Stibbons/oh-my-zsh into gsemet_push_common_aliases
Conflicts:
	plugins/common-aliases/common-aliases.plugin.zsh
2013-06-11 15:01:53 +02:00
Gaetan Semet
b832ec9208 New plugin 'common-aliases' for optional cutting edge zsh aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:58:25 +02:00
Gaetan Semet
745f41114b new repo aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:49:58 +02:00
Gaetan Semet
de518e4242 Update Git aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:49:50 +02:00
Gaetan Semet
ddf9b8be15 new git alias : gfa
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 11:34:40 +02:00