linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-13 03:01:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
2,174 commits 3 branches 0 tags 154 MiB
Commit graph

2,174 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Robby Russell
fc70d76788 Merge pull request #2053 from fluxrad/mosh 
Add support for mosh (remote-shell) tab completion.
 2013-09-18 23:39:12 -07:00
Robby Russell
19e1a3e1ef Merge pull request #2093 from zdevex/fixCommentsInTemplate 
Fixed comments in zshrc.zsh-template about disabling auto updates.
 2013-09-18 23:38:50 -07:00
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
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
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