Commit graph

3,437 commits

Author SHA1 Message Date
Robby Russell
35f1a23735 Merge pull request #3131 from halilim/remove-j-alias
Remove j alias for autojump
2014-11-06 09:27:56 -08:00
Robby Russell
510055a03a Merge pull request #3081 from pavoljuhas/master
update the scd plugin for smart change of directory.
2014-11-06 09:27:43 -08:00
Robby Russell
6118446575 Merge pull request #2974 from elliottwilliams/patch-1
Fix osx function: "not valid in this context"
2014-11-06 09:27:16 -08:00
Robby Russell
e423ca04c8 Merge pull request #2976 from shammellee/patch-1
typo
2014-11-06 09:26:56 -08:00
Robby Russell
57ff83db59 Merge pull request #2946 from moinakg/master
Solaris portability tweaks.
2014-11-06 09:26:48 -08:00
Robby Russell
0f7e5e41b8 Merge branch 'simonbuchan-master' 2014-11-06 09:24:18 -08:00
Robby Russell
81004dfaba 2928 merge conflict 2014-11-06 09:24:00 -08:00
Robby Russell
1b65c55fcf Merge pull request #2959 from crkochan/fix_rake_command
Fix for recusion limit hit for _rake_command alias
2014-11-06 09:19:49 -08:00
Robby Russell
4eff7926b3 Merge pull request #2648 from dfarrell07/master
Fixed which output at each new shell creation
2014-11-06 09:19:20 -08:00
Robby Russell
160abc9a8d Merge pull request #2323 from michaelorr/slow-git-fix
Renaming config for parse_git_dirty() to avoid collision
2014-11-06 09:15:00 -08:00
Robby Russell
2984d2dc4b Merge pull request #2168 from riyad/modernize-virtualenv
Modernize the virtualenv plugin
2014-11-06 09:14:17 -08:00
Robby Russell
ed01122804 Merge pull request #1604 from franklouwers/master
Improve pj-plugin to support projects with spaces in their names + optimise code
2014-11-06 09:13:56 -08:00
Robby Russell
548b9c447d Merge pull request #3224 from Neal/xcode-simulator-fix
Update path for the iOS simulator.
2014-11-06 09:13:40 -08:00
Robby Russell
ba6bf248b4 Merge pull request #3230 from willmendesneto/fix-compass-doc-search
Fix error using compass search alias
2014-11-06 09:13:24 -08:00
Robby Russell
c0905fd82c Merge pull request #3226 from mcornella/fix-plugin-gitignore
[Plugin: gitignore] Several fixes in the plugin
2014-11-06 09:12:27 -08:00
Jaap Broekhuizen
eae70054d1 Added VIRTUAL_ENV_DISABLE_PROMPT to steeef.zsh-theme
This stops the virtual env name from being printed before it is actually being
used in the zsh prompt.
2014-11-03 12:29:19 +01:00
Pavol Juhas
b6012bc2c3 Update to the upstream smart-change-directory.
Synced with the master branch
pavoljuhas/smart-change-directory@20b5a80cf0.
2014-11-02 12:33:56 -05:00
Neal
071de5fb39 Make the simulator alias work with older Xcode versions as well. 2014-10-27 22:17:26 -05:00
Gaetan Semet
fb18815c49 Merge remote-tracking branch 'upstream/master' 2014-10-24 18:52:07 +02:00
Marc Cornellà
b452cafb16 Follow-redirect and silent mode curl throughout gitignore
This commit completes previous efforts and standardizes both curl commands
into using silent mode and following redirects in case the URL changes
again in the future.
2014-10-22 18:13:15 +02:00
WooParadog
04d1428fcb Fix gitignore curl, should follow redirects 2014-10-22 18:13:15 +02:00
Alex Shaindlin
69a0b280c7 Fix misspellings in gitignore plugin 2014-10-22 18:13:15 +02:00
Andrii Kostenko
b9a11b16fe fixed URL on github.io
github.io moved to https and http returns 301 redirect
2014-10-22 18:13:15 +02:00
Robby Russell
7f07facf41 Merge pull request #3252 from mcornella/fix-auto-named-dirs-prompt
Don't set auto_name_dirs because it messes up prompts
2014-10-22 08:00:49 -07:00
Marc Cornellà
36e05e95ad Don't set auto_name_dirs because it messes up prompts
From http://zsh.sourceforge.net/Doc/Release/Options.html#Completion-4

> AUTO_NAME_DIRS
> Any parameter that is set to the absolute name of a directory immediately
> becomes a name for that directory, that will be used by the ‘%~’ and
> related prompt sequences, and will be available when completion is performed
> on a word starting with ‘~’.
> (Otherwise, the parameter must be used in the form ‘~param’ first.)

Explained in more detail in
https://github.com/wayneeseguin/rvm/issues/3091#issuecomment-60083194

Related issues:
https://github.com/robbyrussell/oh-my-zsh/issues/2857
https://github.com/robbyrussell/oh-my-zsh/issues/3238
https://github.com/wayneeseguin/rvm/issues/3091
2014-10-22 15:39:27 +02:00
Gaetan Semet
4075a08aec don't set merge tool in gitconfig
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-10-22 13:47:41 +02:00
Gaetan Semet
fd29a52c73 use txw gerrit-getGroupMembers in bb_repo_upload
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-10-22 13:47:23 +02:00
Gaetan Semet
2bead59378 new alias for ls : llR
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-10-22 13:47:02 +02:00
Markus Faerevaag
9f801ff48d [wd] fix space in path 2014-10-21 09:54:15 +02:00
willmendesneto
6f1eb081e3 Fix error using compass search alias 2014-10-18 11:06:24 -03:00
Neal
d794a502f6 Update path for the iOS simulator. 2014-10-14 13:57:19 -05:00
Nikhil Gupta
71ee0d7b2b added support for GNU version of date 2014-10-14 20:44:31 +05:30
Moinak Ghosh
3a39732845 Change to epoch target in days instead of seconds. 2014-10-14 12:05:01 +05:30
Gaetan Semet
0d644e7997 H in gr* aliases (git reset) means --hard
Principle is to use a capital letter for more dangerous
commands. grh means "git reset HEAD", which cannot involve data lose.
grH means "git reset --hard", which CAN involve data lose.
grhH now means "git reset --hard HEAD".

I intentionnaly chose to not aliase H to "HEAD" and h to --hard.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-10-13 11:44:31 +02:00
Gaetan Semet
f56a77a500 update gitconfig
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-10-13 11:40:48 +02:00
Gaetan Semet
ca8628d907 new alias: grH
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-10-13 11:40:41 +02:00
Gaetan Semet
cf1c065d71 Merge remote-tracking branch 'cadusk/master'
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
2014-10-07 11:53:12 +02:00
Carlos Cardoso
c4520bca74 Merged latest changes from upstream in
* blessed/master:
  Revert "Exit early from git plugin if not in git repo."
  Support dynamically defined Vagrant machines
  Symfony2 plugin autocomplete for app/console and bin/console
  Symfony2 plugin look for files only
  Symfony2 plugin use first console found
  fix missing add-zsh-hook in pygmalion.zsh-theme
  Use $OSTYPE instead of uname to speed things up
  Trust but verify 'scutil' to return ComputerName
2014-10-02 10:09:58 -03:00
Gaetan Semet
7ef4724661 Merge remote-tracking branch 'upstream/master'
Conflicts:
	README.textile
	lib/aliases.zsh
2014-09-18 16:02:13 +02:00
Gaetan Semet
183fdb480f git lol(a)
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2014-09-18 15:59:47 +02:00
Robby Russell
8ca39dec74 Revert "Exit early from git plugin if not in git repo." 2014-09-18 15:59:47 +02:00
Philipp Wahala
439c3de02f Symfony2 plugin look for files only 2014-09-18 15:59:47 +02:00
Philipp Wahala
fb9a0be853 Symfony2 plugin use first console found 2014-09-18 15:59:47 +02:00
Robby Russell
38673ba1c4 Revert "Add Composer's local binaries to PATH" 2014-09-18 15:59:46 +02:00
Robby Russell
90f7c06b08 Revert "Add a CONTRIBUTING file to instruct people on issues and pull requests" 2014-09-18 15:59:46 +02:00
Halil Özgür
ba3a026ece Use the library function for ruby prompt
Not everyone uses rvm and the library has already got a function for this.
2014-09-18 15:59:46 +02:00
Robby Russell
06f8e22596 Link to swag in installer... shameless profiting 2014-09-18 15:59:40 +02:00
Chris Smith
f2ce3fe117 Adding README.md and renaming plugin 2014-09-18 15:59:40 +02:00
nervo
fc6ff20887 Add Composer's local binaries to PATH 2014-09-18 15:59:40 +02:00
Marc Cornellà
e5973b5004 Update pass completion to upstream
Conflicts:
	plugins/pass/_pass
2014-09-18 15:59:40 +02:00