Commit graph

2,270 commits

Author SHA1 Message Date
Gaetan Semet
429a29d5cd updated default gitconfig file
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-29 16:24:04 +01:00
Gaetan Semet
99ae9e2388 new git alias: git sync
This does like repo sync, ie, sync to all remotes at once.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-29 16:19:26 +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
Gaetan Semet
d2fe42acff updated projects path
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-29 15:38:31 +01:00
Alexandre Joly
0eb86f82d6 updated to the latest version of cocoapods 0.27.1 2013-10-29 10:33:37 +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
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
Gaetan Semet
c6a2447206 updated buildbot dir
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-23 10:23:45 +02: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
Gaetan Semet
a394bfe8ee Reworked Git aliases
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-10-16 15:06:59 +02:00
oxnz
500e5a73b6 add itunes function to control itnues from the terminal 2013-10-16 16:43:03 +08:00
Kaiwen Xu
c5902d3f34 Moved misplaced plugins. 2013-10-14 07:39:59 -04:00
Kaiwen Xu
a7693b096f gitignore fix for custom folder. 2013-10-13 15:49:24 -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
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
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
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
Yad Smood
0216ed6313 add: tty display. 2013-09-30 15:27:22 +08: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
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
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
88c9d0113a Merge pull request #2087 from Stibbons/gsemet_push_theme_chooser
Display right prompt in theme chooser
2013-09-19 06:48:55 -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