1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-12-18 18:31:59 +00:00
Commit graph

642 commits

Author SHA1 Message Date
Kyle Smith
d8521693f4 Added support for entries in /etc/ssh/ssh_known_hosts. 2011-12-22 14:02:01 -05:00
julien@macbook
dd14e075b7 Ignore submodules dirty in prompt info 2011-12-21 15:03:55 +01:00
Daniel Hahler
98578ec241 setopt append_history is not necessary.
Especially given the inc_append_history option, it is not necessary to
set the (default) append_history option.
2011-12-16 14:21:45 +01:00
Daniel Hahler
70e51186ec Only setopt correct, not "correct_all".
Using the correct_all option is too distracting, and needs a lot of
`nocorrect` aliases to work around this.

Using only "correct" to correct the command itself is more friendly.
2011-12-16 14:01:59 +01:00
Sébastien M-B
3726611275 Merge remote branch 'upstream/master' 2011-12-15 16:15:23 +01:00
Robby Russell
d1b6423f2f Merge pull request #732 from ggustafsson/patch-1
Removed duplicate setting and sorted the remaining
2011-12-14 21:59:37 -08:00
Göran Gustafsson
3fc812afc9 Removed duplicate setting and sorted the remaining 2011-12-03 13:18:37 +01:00
Christian Höltje
40c47a7375 lib/termsupport now uses add-zsh-hook
This is needed to play nice with plugins that need various hooks.
2011-11-15 01:14:03 -05:00
Sébastien M-B
c4434d2dde Update completion for SSH
Add all hosts found in ~/.ssh/config.
Tip found on: http://www.nerux.org/wiki/OpenSSH#coupler_avec_zsh_completion
2011-11-05 00:34:37 +01:00
Robby Russell
762b55bb2b Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506
Add key bindings for gnome-terminal on Fedora
2011-08-30 21:09:36 -07:00
Robby Russell
9d67d75b0a Revert "Enable red dots during completion by default".
After a few weeks of using this, I'd prefer this to not be enabled by default. My bad for suggesting that in the first place.

This reverts commit fc49b4a4de.
2011-08-30 20:56:13 -07:00
Robby Russell
be2ab22694 Merge pull request #492 from hwti/red-dots-completion
Display red dots during completion process (disabled by default)
2011-08-11 05:51:03 -07:00
Randy Hancock
f20cfc68e8 Fix edit-command-line binding
This binding doesn't work when the edit-command-line.zsh file is loaded
after the key-bindings.zsh file because 'bindkey -e' in key-bindings.zsh
resets the binding. Moving the bindings to they key-bindings.zsh file
and removing edit-command-line.zsh.
2011-08-01 13:06:52 -05:00
James Smith
0ba398f9e1 Merge in recent stuff 2011-08-01 00:44:51 -07:00
Robby Russell
a738ca9b64 Merge pull request #464 from bkonkle/patch-1
Minor corrections to deletion detection in git_prompt_status
2011-07-30 18:08:54 -07:00
Loïc Yhuel
fc49b4a4de Enable red dots during completion by default 2011-07-28 19:52:53 +02:00
Loïc Yhuel
0848acfb25 Display red dots during completion process (disabled by default) 2011-07-24 21:48:21 +02:00
Loïc Yhuel
428f18cf42 Add key bindings for gnome-terminal on Fedora 2011-07-23 23:09:03 +02:00
Robby Russell
46440e7198 Merge pull request #208 from sorin-ionescu/plugin-extract
extract plugin
2011-07-23 09:33:42 -07:00
Robby Russell
5e4d89385f Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-07-23 09:13:57 -07:00
Sven Lito
eb63ddf6bb added mac keybinding for backward-delete-char 2011-07-23 09:11:08 -07:00
Robby Russell
ae9457d84d Merge pull request #487 from dreur/upstream-spectrum-utility
Add utility method to spectrum
2011-07-23 08:58:10 -07:00
hobbestigrou
34f00f385c More generic. 2011-07-23 08:54:47 -07:00
Benjamin Boudreau
cbaa97d8c3 Add utility method to spectrum 2011-07-23 11:09:45 -04:00
Christopher Sexton
a38774c98d C-x C-e to edit current command in EDITOR
The command C-x C-e opens the current command line for editing
in the editor defined by the $EDITOR environment variable.

Thanks to Craig Bosma and his blog post about this:
http://distrustsimplicity.net/articles/zsh-command-editing
2011-07-18 09:54:59 -04:00
Brandon Konkle
6774fb3d59 Minor corrections to deletion detection in git_prompt_status 2011-07-13 23:23:01 -07:00
Andrew Hodges
25adbe81a5 Aliases
Modify directory listing aliases to make more sense. Remove conflicting helper
function (mcd conflicts with mtools).
2011-06-05 08:08:58 -04:00
Sorin Ionescu
1db6575f14 Added extract plugin. 2011-06-01 20:33:16 -04:00
Michael Hanson
c014dca141 Fix deleted in git.zsh 2011-05-31 15:59:38 -07:00
Robby Russell
a81b0171cc Merge pull request #196 from asymmetric/master
Add missing flag to unrar
2011-05-26 01:13:18 -07:00
Robby Russell
d275440219 Merge pull request #290 from arthurkalm/delete-key-working
Make the delete key work correctly, instead of outputting a ~
2011-05-13 02:52:25 -07:00
Robby Russell
4f71818a8b Merge pull request #329 from juanghurtado/master
Support for $(current_branch) on git_parse_ahead()
2011-05-13 02:48:50 -07:00
Juan G. Hurtado
e129fc5a28 Adds support for $(current_branch) on git_parse_ahead()
Changes method git_parse_ahead() on git.zsh lib file. Before this
change it checked directly against origin/master branch. Now it
uses $(current_branch) to check for not pushed changes against
the current remote branch.
2011-05-09 13:32:42 +02:00
Renaud (Nel) Morvan
e3cede37a0 Relax pattern matching on TERM. Closes #320. 2011-05-02 13:51:16 +02:00
Juan G. Hurtado
077baa7bb1 Adds new prompt methods on Git lib
Modifies the Git lib file (lib/git.zsh), adding three new prompt
methods:

- git_prompt_ahead(): Shows the content of the custom var
  $ZSH_THEME_GIT_PROMPT_AHEAD if the local repository has
  commits ahead from the remote origin repository

- git_prompt_short_sha(): Shows last commit SHA hash in short
  mode wrapped between the content of the custom vars
  $ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
  $ZSH_THEME_GIT_PROMPT_SHA_AFTER

- git_prompt_long_sha(): Shows last commit SHA hash in long
  mode wrapped between the content of the custom vars
  $ZSH_THEME_GIT_PROMPT_SHA_BEFORE and
  $ZSH_THEME_GIT_PROMPT_SHA_AFTER
2011-04-29 09:22:56 +02:00
Pat Regan
655e6e8df0 Merge remote branch 'upstream/master'
Conflicts:
	plugins/github/github.plugin.zsh
2011-04-20 01:29:58 -04:00
Arthur Kalmenson
7d9628b2dc Added bindings for Gnome terminal. 2011-04-19 22:40:46 -04:00
Arthur Kalmenson
c7c959de60 Make the delete key work correctly, instead of outputting a ~ 2011-04-19 19:01:18 -04:00
Pat Regan
16ac094a43 Moved compinit call back to oh-my-zsh.sh, after plugins are loaded 2011-04-12 09:28:15 -04:00
Robby Russell
8883ace767 Revert "Enable alias completion, do not limit completion to just files"
This reverts commit c3a58b0004.
2011-04-12 10:24:06 +02:00
Pat Regan
ef4175981b Moved the single compinit call from oh-my-zsh.sh to lib/completion.zsh 2011-04-08 11:10:14 -04:00
Pat Regan
993e05da50 Replace redundant calls to compinit with a single call. 2011-04-08 10:12:22 -04:00
Renaud (Nel) Morvan
0cc0915bf8 Refactor DISABLE_AUTO_TITLE to be more DRY 2011-04-04 14:02:50 +02:00
Renaud (Nel) Morvan
a3e92892bb Command title behavior no longer depend on local zsh configuration
Fix by derekjw. closes #52.
2011-04-04 13:56:00 +02:00
Renaud (Nel) Morvan
d138751cbd Escape characters used in escape sequence to avoid triggering bugs in Apple Terminal
Closes #45 #57 #58 #86.
2011-04-04 13:49:02 +02:00
Lorrin Nelson
06063ab695 Introduce DISABLE_AUTO_TITLE option 2011-03-23 21:20:08 -07:00
James Smith
2d5412e99b Added new function git_remote_status to check if we are ahead, behind or diverged from the remote branch 2011-03-19 17:50:24 -07:00
Robby Russell
52df85440e Revert "Re-order title/tab setting to make window titles work on OSX terminal which"
Was causing iTerm title to disappear entirely..

This reverts commit d4ea399b04.
2011-03-16 12:20:35 -07:00
Robby Russell
fce2733fe9 Merge branch 'osx-terminal-title' of https://github.com/curiousstranger/oh-my-zsh into curiousstranger-osx-terminal-title 2011-03-16 08:01:29 -07:00
Matt Cable
d4ea399b04 Re-order title/tab setting to make window titles work on OSX terminal which
doesn't support tabs titles.
2011-03-13 17:11:32 -06:00
Woody Gilk
c3a58b0004 Enable alias completion, do not limit completion to just files 2011-03-11 21:44:12 -06:00
Robby Russell
4ef3bb4847 Merge branch 'refactor-term' of https://github.com/nel/oh-my-zsh into nel-refactor-term 2011-02-21 22:00:05 -08:00
Robby Russell
6a3f406468 Merge branch 'lib-git' of https://github.com/sorin-ionescu/oh-my-zsh into sorin-ionescu-lib-git 2011-02-21 21:50:36 -08:00
Robby Russell
452eeed890 Merge branch 'nicoulaj-theme' of https://github.com/nicoulaj/oh-my-zsh into nicoulaj-nicoulaj-theme 2011-02-21 21:45:00 -08:00
Sorin Ionescu
90a9a5f251 Added modified while newly added and type change detection to git prompt modified status. 2011-02-03 23:24:33 -05:00
Renaud (Nel) Morvan
faac3ba8fc Refactor window and tab title in tty
Term window title and tab title are now skinable
Tab title can be different from window title (when supported by term)
Default theme is optimized of usuability (no %u@%m: $~ in a 10 char tab)
Cleanup code duplication and add comment for supported terms
On osX it works great on iterm, and is decent once you tweak Terminal pref
Tested under GNU screen, iTerm and Apple Terminal, need to be tested on linux
TODO implement Konsole support (via dbus)
2011-01-30 09:19:47 +01:00
Lorenzo Manacorda
fcc7801435 add missing unrar flag 2011-01-24 15:49:49 +01:00
Robby Russell
f02e732543 Merge branch 'master' of https://github.com/SuprDewd/oh-my-zsh into SuprDewd-master 2011-01-15 01:17:29 -08:00
SuprDewd
beb980d370 Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2011-01-10 17:56:38 +00:00
Robin Ramael
bcc235e142 Added an option to remove file afterwards. 2011-01-10 17:49:53 +00:00
Michael Komitee
8294cf44d1 Postponing sourcing of the theme until after local customizations 2011-01-08 23:34:47 -05:00
SuprDewd
f0136f2aec Support for more archive formats. 2010-12-25 13:28:16 +00:00
SuprDewd
ff0b25b745 Added a function to extract various archives.
Also an alias for the function.
2010-12-24 22:20:57 +00:00
Derek Prior
2b03b95122 Added function to mkdir and immediately change to it 2010-12-21 14:28:40 -05:00
Julien Nicoulaud
f624889aa4 Rename appearance.zsh so that it gets loaded after spectrum.zsh.
Allows to use 256 colors in prompt themes.
2010-11-20 18:06:23 +01:00
gwjo
9465ba0de4 Completion fixes
Use /etc/hosts in addtion to $HOME/.ssh/known_hosts as the source for
hostname completion

Turn on completion caching to speed up certain comands

When completing usernames, don't include system accounts by default
2010-11-03 16:57:15 -04:00
Sven Lito
dc12853b0c merging in changes from robby's repo 2010-10-09 19:11:07 +01:00
Robby Russell
7ab4d30fe1 Merge branch 'title-fix' of http://github.com/philips/oh-my-zsh into philips-title-fix 2010-10-09 09:55:52 -07:00
Brandon Philips
aab235f612 functions: fix title() to not match any $TERM
On my linux virtual terminals, where TERM="linux", I was getting
annoying output that was messing up my prompt.

It turns out the title function was always matching on the elif
statement for xterm/rxvt no matter what and the linux vt doesn't know
what to do with the title special control sequence and thus was printing
out garbage.

Through experimentation I figured out that the || inside of the [[ ]]
did not work:

export TERM=linux
$ if [[ $TERM =~ "^xterm" || $TERM == "rxvt" ]]; then echo $TERM; fi
linux

$ if [[ $TERM =~ "^xterm" ]] || [[ $TERM == "rxvt" ]]; then echo $TERM; fi

Signed-off-by: Brandon Philips <brandon@ifup.org>

openSUSE running zsh 4.3.10
2010-10-08 22:55:09 -07:00
Irakli Gozalishvili
8059c0727a Improving git plugin so it can display much more data. 2010-10-09 01:48:23 +02:00
Trevor Creech
b905630366 Match xterm-color, the default OS X terminal 2010-09-30 21:00:38 -07:00
Robby Russell
36c05fbe8d Merge branch 'named_dirs_completion' of http://github.com/kremso/oh-my-zsh into kremso-named_dirs_completion 2010-09-30 20:50:00 -07:00
Robby Russell
6104e59c8d Merge branch 'shifttab' of http://github.com/kremso/oh-my-zsh into kremso-shifttab 2010-09-30 20:48:10 -07:00
Tomas Kramar
74b2c5d75a Do not complete named-directories 2010-09-26 18:29:14 +02:00
Robby Russell
99f159e0a7 Removing '.' alias as it is overwriting a bash/zsh feature. Closes #63 2010-08-24 11:08:20 -07:00
James Rowe
6efc79c74e Don't correct hpodder commands. 2010-06-05 23:23:53 +08:00
James Rowe
f9fbd07983 Don't display dotfiles or reverse sort with ll alias.
The ll alias is a very common default for bash in Linux distributions, so use
that definition.
2010-06-05 23:22:57 +08:00
James Rowe
edc8e3d092 Ignore commands that start with a space.
This is useful when you want to use a dangerous command, as it won't be
available with history searching.
2010-06-05 23:22:57 +08:00
James Rowe
6774490a46 Don't auto-correct ebuild commands.
It breaks "ebuild <foo> manifest", as there are Manifest files in the directory.
2010-06-05 23:22:57 +08:00
Robby Russell
27904c117c Moving current_branch() to git plugin 2010-06-03 12:56:11 -07:00
Robby Russell
89bd2bf317 Moving some rails and osx-specific functions to their corresponding plugin files 2010-06-03 12:55:07 -07:00
Robby Russell
455669e976 Removing legacy completion code 2010-06-03 12:54:40 -07:00
Robby Russell
ab2c0744ab Removing rake completion from lib/ as it was moved to rails plugin 2010-06-03 12:33:15 -07:00
Robby Russell
3cf9ab722e Initial implementation of a new plugin system, so that people can managed which aliases/functions they want. 2010-06-03 12:03:26 -07:00
Alan Harper
ba9c78fc9b Import rvm prompt 2010-05-28 08:13:17 +08:00
Mike Hostetler
93f9825b79 share history with your zsh's on the same host 2010-05-08 04:23:50 +08:00
Dylan Clendenin
9efc086fb3 two aliases set to 'ss', clobbering rails script/server 2010-05-08 04:22:34 +08:00
Robby Russell
7a9d4ceb75 Merge remote branch 'jreese/master' 2010-05-07 13:16:50 -07:00
kremso
926d9e8893 Don't autoselect first completion entry (Fixes #14)
The key here is not using MENU_COMPLETE which autoselects the first
entry, but using AUTO_MENU which displays the menu but autoselects
on successive tab hit.

Also, do not use zstyle menu yes because that somehow overrides
the setopts.
2010-05-06 21:06:58 -07:00
Robby Russell
447da5816e Removing rake autocompletion as this is apparently baked into recent versions of zsh 2010-05-06 21:04:09 -07:00
canthiswait
e8ef16570f escape sequences so rprompt doesn't mess up 2010-05-06 20:46:32 -07:00
canthiswait
02bd8ab53e Added scpectrum script for easy 256 color theaming 2010-05-06 20:46:32 -07:00
Andy Fowler
3c87d48362 makes git status prompt 4x faster
(via git status -s, benchmarked)
2010-05-06 20:37:00 -07:00
John Reese
99d72cad55 Ignore errors from compaudit when using sudo -s 2010-04-08 22:35:35 -04:00
Tomas Kramar
3e1d5fa316 Make Shift+Tab move backwards in the menu 2010-03-22 21:44:15 +01:00
Martin Klepsch
f9509f365b Putting Git related aliases into git.zsh to have them in context. 2009-12-27 21:19:40 -08:00
Dale Campbell
90627d3d1c adding quotes to tab() 2009-12-27 21:16:16 -08:00
Robby Russell
2ecc228b23 Adding a function that will open up a ticket in Lighthouse based on the number and there being a URL in a hidden file. 2009-12-16 11:23:41 -08:00
Robby Russell
98d56a3097 Adding a nocorrect for the heroku command as it was getting triggered by heroku logs. 2009-12-13 11:48:03 -08:00
To1ne
e429ff9e2b no correction on gist 2009-12-12 10:12:14 +01:00
To1ne
dfb3fb5a0a No correction on mkdir + removed duplicate nocorrect mv 2009-12-10 19:04:06 +01:00
Toon Claes
065ae00673 Revert 2009-12-01 23:06:15 +01:00
Toon Claes
dca4651cee Completion from history 2009-11-30 23:28:40 +01:00
Robby Russell
473dd3b212 Adding current_branch function, which can be used like: git pull origin master 2009-11-25 12:45:16 -08:00
Toon Claes
147f1dc702 Modifying changes for issue 25, to fix issue 27 2009-11-09 21:38:40 +01:00
Toon Claes
729fd0ab3c Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh 2009-11-09 21:28:17 +01:00
Robby Russell
c620408962 Revert "Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed)."
This reverts commit 14a1ce80bb.
2009-11-09 07:33:51 -08:00
Robby Russell
5c13930832 Revert "Whoops, forgot to include this dummy precmd implementation."
This reverts commit a21525ba0c.
2009-11-09 07:33:38 -08:00
Robby Russell
fc3a3c72b1 Only using the contents of .ssh/known_hosts when the file exists for ssh/scp auto-completion. Closes issue #20 2009-11-08 15:34:02 -08:00
Robby Russell
eb05b61483 Removing gdb alias as it conflicts with an actual command for gdb. Closes #17 2009-11-08 15:27:17 -08:00
Robby Russell
286559d180 Revert "Fixed issue #19 'Rake not auto completing'. The stat command syntax that was being used was not correct. Or at least on my machine. See man page for the stat command"
This reverts commit 83907294d6.
2009-11-08 15:24:20 -08:00
meh
8f33231823 Fixed issue #25. 2009-11-09 07:15:06 +08:00
James Adam
a21525ba0c Whoops, forgot to include this dummy precmd implementation. 2009-11-09 07:14:52 +08:00
James Adam
14a1ce80bb Added my prompt theme, with a tweak to the core oh-my-zsh to support it. My git_prompt_info function not only reports the branch and dirty status, but also whether or not the branch is ahead or behind of the remote, or both. It also switches the prompt colour from green to red if the previous command exited with a non-zero value (i.e. failed). 2009-11-09 07:14:52 +08:00
Toon Claes
bbef2db92b parse error fix 2009-11-05 20:48:08 +01:00
Toon Claes
08fcf7dc39 Enabled colors in ls and made it possible to theme them 2009-11-05 20:44:28 +01:00
Toon Claes
e2dba2c3e9 Joined the appearance so the theme can apply LSCOLORS too 2009-11-04 20:37:18 +01:00
Robby Russell
83309294df Adding devlog alias for tailing development.log for Rails 2009-11-01 14:23:03 -08:00
Robby Russell
fd6861b8cd Fixing some conflict residue that I missed in a commit/merge: 2009-10-26 09:24:37 -07:00
Robby Russell
5fe112eb4b Merge branch 'master' of git://github.com/mrinterweb/oh-my-zsh into mrinterweb/master 2009-10-26 09:19:24 -07:00
Robby Russell
58bccaf6fc Fixing merge conflicts 886d97f41e 2009-10-26 09:16:19 -07:00
Gerhard Lazu
1779bedd53 lsa now uses coloring 2009-10-26 09:09:40 -07:00
Gerhard Lazu
552e4b864a ll doesn't show hidden files, lsa does 2009-10-26 09:09:14 -07:00
Robby Russell
52f5eb2005 Merging conflict. 788c9af056 2009-10-26 09:09:00 -07:00
Robby Russell
56693663ad Merge branch 'master' of git://github.com/mdonoughe/oh-my-zsh into mdonoughe/master 2009-10-26 08:57:29 -07:00
Sean McCleary
83907294d6 Fixed issue #19 'Rake not auto completing'. The stat command syntax that was being used was not correct. Or at least on my machine. See man page for the stat command 2009-10-23 11:59:24 -07:00
Toon Claes
a75d0ba8d7 Fixing merge 2009-10-16 22:14:43 +02:00
Robby Russell
c03aab5164 Renaming script/server --debug alias to ssd to avoid conflict. Closes #1 2009-10-12 19:13:52 -07:00
James Salter
b6c8ef41b1 added gcp alias (git cherry-pick) 2009-10-13 12:34:53 +11:00
To1ne
6ef2e1f51c Added some comment 2009-10-12 21:17:36 +02:00
Gerhard Lazu
788c9af056 Added more aliases for Rails & git 2009-10-11 15:09:10 +01:00
Gerhard Lazu
fdac2b3f04 Added ack-grep searching 2009-10-11 14:49:24 +01:00
Gerhard Lazu
7705ffaf0c Added git diff for vim (gdv) 2009-10-11 09:56:22 +01:00
Matthew Donoughe
c1444a9612 should probably use the value of CASE_INSENSITIVE 2009-10-07 20:08:54 +00:00
Matthew Donoughe
cea6040c30 allow case sensitivity to be toggled 2009-10-07 20:03:23 +00:00
Markus Prinz
60e99779d5 Make "-" an alias for "cd -" (cd back to previous directory) 2009-10-03 19:48:29 +02:00
Jon Evans
eddab5034c run update check *after* running custom configuration scripts.
This means we are running it after $PATH has potentially been set up,
which means it's more likely that commands like "git" will be found
2009-10-01 08:55:07 +01:00
Robby Russell
00a190bc01 Oh My Zsh gets a weekly auto-updater... the future is now! 2009-09-23 17:12:19 -07:00
James Cox
f363c025da put everything in lib 2009-09-23 16:14:43 +01:00
James Cox
8a8a7bafa0 merge upstream 2009-09-23 16:14:04 +01:00
Robby Russell
ff545e6934 Bumping up history to 10k commands 2009-09-23 08:07:02 -07:00
Robby Russell
8debd097fb Moving all zsh config options into a lib/ subdirectory to make way for some upcoming changes to directory structure and configuration options 2009-09-23 07:43:36 -07:00