Commit graph

2,082 commits

Author SHA1 Message Date
UncleBill
87a1d8a02d git-pull add --rebase option 2013-06-25 12:08:02 +08: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
78dba754d1 Merge pull request #1872 from gdetrez/new-powerline-range
Update the character used from powerline
2013-06-21 07:11:47 -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
0f2b24c1b8 Merge pull request #1887 from tgkokk/git-slow-fix
Fixed slow behavior when using GitHub wrappers
2013-06-21 07:07:26 -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
8c1d358741 updated README
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 12:16:39 +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
17a7a47fc0 Rebase on update
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-18 11:28:32 +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
46d4606e66 Merge pull request #1756 from rkj/master
Fixed missing retcode if you tried to use themes/rkj
2013-06-17 21:23:18 -07:00
Robby Russell
b88b5b2ed6 Merge pull request #1885 from eakret/termsupport-fix
Escape both % and $ in the command line
2013-06-16 11:50:59 -07: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
Robby Russell
4370e2ac32 Merge pull request #1893 from jeremydt/postgres
Add new plugin for homebrew installed version of postgres
2013-06-16 11:49:18 -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
Robby Russell
b8af807b43 Merge pull request #1878 from spazm/virtualenv-cleanup
virtualenv cleanup: replaces subshell with prompt expansion.
2013-06-12 19:27:07 -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
Theodore Kokkoris
9703eba66e Fixed slow behavior when using GitHub wrappers 2013-06-12 20:04:08 +03:00
Gaetan Semet
a21aea7ea4 Add cdp alias
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-12 16:41:53 +02: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
Ehren Kret
ab7604e5c2 Escape both % and $ in the command line
Fixes issue #1884
2013-06-11 11:37:35 -07: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
b2d8d022f2 Merge remote-tracking branch 'upstream/master' 2013-06-11 14:52:46 +02:00
Gaetan Semet
5817a61e59 source ~/.profile for upgrading (to source the proxy configuration)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-11 14:50:32 +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
Michiel Missotten
d6945e2daa Adding a rebase option to git alias. 2013-06-11 11:23:02 +02:00
Gaetan Semet
521f9e78b6 New git alias : gitk-entier-history
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-10 11:40:36 +02:00
Gaetan Semet
473e5a636a Updated dotfile with git configuration
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-06-10 11:37:57 +02:00
San Martin Morote Eduardo
60aa92bae3 Messed up the comment somehow... 2013-06-09 11:04:39 +02:00