Commit graph

2,268 commits

Author SHA1 Message Date
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
Robby Russell
ac58ffdf66 Merge pull request #1840 from yleo77/master
About gf alias
2013-09-18 23:37:28 -07:00
yleo77
0240ac6496 Merge remote-tracking branch 'robbyrussell/master' 2013-09-19 12:40:45 +08:00
Maxime Chaisse-Leal
4dbe4378db Added WIP alert to the gallois' theme 2013-09-18 21:56:10 +02: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
14669197f0 ignore eclipse workspace dir
Signed-off-by: Stibbons <gaetan@xeberon.net>
2013-09-18 00:11:28 +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
David Strawn
9d2b5c841e Fixed comments in zshrc.zsh-template about disabling auto updates.
Previously they did not make sense nor were they accurate.
2013-09-14 12:26:33 -06:00
Gaetan Semet
fc27f4088b Merge remote-tracking branch 'dlintw/2024-list-theme-features' 2013-09-11 15:33:29 +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
475fb3a29b Merge pull request #1829 from docwhat/compinit
Create the zcompdump based on version and host
2013-09-11 06:19:43 -07:00
Robby Russell
1c468c63c0 Merge pull request #839 from eproxus/sunrise-fixes
Correct color and font issues on Ubuntu
2013-09-11 06:18:46 -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
Alexandre Joly
40b1cf0103 repo list search one level deeper
the folder structure changed '.cocoapods/' -> '.cocoapods/repos'
2013-09-10 15:20:57 +02: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
0fcb7dd55e Display right prompt in theme chooser
I didn't found the way to right-align the right prompt
properly.

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:28:31 +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
1199089bcc Merge branch 'gsemet_push_jump_changes' 2013-09-10 11:26:02 +02:00
Gaetan Semet
9bd691f858 Jump helper messages
- 'jump' call marks when no argument is given
- some error messages
- j as alias for jump (very useful)

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-09-10 11:24:02 +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
Alexandre Joly
bdb2cabaa6 typo 2013-09-10 09:17:09 +02:00
Alexandre Joly
f6fb34845d updated the arguments list to the newest version (0.24.0) of cocoapods 2013-09-10 09:14:24 +02:00
Hervé Cauwelier
b592f9aac3 activate virtualenvwrapper by default 2013-09-09 10:29:20 +02:00
Hervé Cauwelier
f0d2ec537e plugins/git: missing compdefs and new aliases 2013-09-09 10:29:20 +02:00
Robby Russell
dff966afad Logo draft 1... 2013-09-06 16:00:24 -07:00
Robby Russell
d7b594e5cd Merge pull request #2045 from jeroenjanssens/master
Add jump plugin, which allows you to easily jump around the file system
2013-09-06 14:35:00 -07:00
Jeroen Janssens
d3e005d6b4 Fix aliasing pwd 2013-09-06 15:29:14 -04:00
Jeroen Janssens
255b0c4f5e Mark function asks for confirmation and uses basename of directory when no argument is given 2013-09-06 09:55:43 -04:00
Jeroen Janssens
55d4873f91 Change marks function and remove 'function' keyword as suggested by pielgrzym in https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22820224 2013-09-06 09:40:44 -04:00
Jeroen Janssens
4517db6acc Add _completemarks function as suggested by pielgrzym in https://github.com/robbyrussell/oh-my-zsh/pull/2045#issuecomment-22826540 2013-09-06 09:34:27 -04:00
Jeroen Janssens
9cd1afb871 Merge pull request #2 from JustinAiken/feature/marks_autocomplete_avaiable
Great addition. Thanks!
2013-09-06 06:07:25 -07:00
Stanislav Mekhonoshin
69ce2362d6 Support of parallel bundle install 2013-09-05 20:22:46 +04:00
Justin Aiken
a265acee4f Better filename matching 2013-09-05 10:00:14 -06:00
Justin Aiken
128cd3f566 Filter out missing links with jump autocomplete 2013-09-05 09:39:22 -06:00
Paul Melnikow
4da4d12d33 Sublime Text: Harmonize alias with the Sublime Text install instructions
The typical command is `subl`, not `st`. Leaving both for backward compatibility.

See http://www.sublimetext.com/docs/2/osx_command_line.html
2013-09-05 10:12:12 -04:00
Paul Melnikow
3007f96090 NVM: Avoid providing completions when nvm is not installed 2013-09-05 10:09:19 -04:00
Torsten Bühl
5bf20572cc Add commonly used git stash aliases 2013-09-05 14:37:37 +02:00
Paul Melnikow
e3c02bfeba Plugin for Node Version Manager 2013-09-04 18:07:58 -04:00
Gaetan Semet
8777dd25de Improvement of the jump plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-08-30 14:04:25 +02:00
Alexander Gronemann
958c847f54 Update bundler.plugin.zsh
Added taps to bundled_commands
2013-08-29 16:20:40 +02:00
Mr Prud
baffc3b0bd Replace no unicode glyph on hexa string 2013-08-29 14:07:09 +02:00
yleo77
fda5afaebc Merge remote-tracking branch 'robbyrussell/master' 2013-08-29 13:41:42 +08:00
Gaetan Semet
7306953c94 new function in bb plugin
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-08-28 10:41:54 +02:00
Gaetan Semet
e91604d729 Theme chooser display right prompt
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
2013-08-28 10:41:38 +02:00