4f8d6a8b15
Merge pull request #1773 from essembeh/master
...
Uncomment l alias
2013-06-25 09:10:05 -07:00
0f2b24c1b8
Merge pull request #1887 from tgkokk/git-slow-fix
...
Fixed slow behavior when using GitHub wrappers
2013-06-21 07:07:26 -07:00
9703eba66e
Fixed slow behavior when using GitHub wrappers
2013-06-12 20:04:08 +03:00
ab7604e5c2
Escape both % and $ in the command line
...
Fixes issue #1884
2013-06-11 11:37:35 -07:00
4ff861ee11
Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option.
2013-05-19 12:55:10 -07:00
f77a545a4b
Uncomment l alias
2013-04-28 16:34:36 +02:00
b6ea876971
Merge pull request #690 from essembeh/master
...
Adding ~/.ssh/config parsing for host list and theme.
2013-04-23 21:27:51 -07:00
8890df1251
Merge pull request #922 from sbfaulkner/master
...
patch rbenv support for themes
2013-04-23 20:57:24 -07:00
81ed0c4115
Resolving conflict with merge of #970
2013-04-23 20:44:35 -07:00
685c746cc7
Merge pull request #1565 from serdardalgic/autoenv-plugin
...
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv.
2013-04-23 20:33:50 -07:00
a2c8db9eb3
Resolving conflict in #1266 merge
2013-04-23 20:30:21 -07:00
7cdb6d667c
Resolving conflict when merging in 1570
2013-04-23 20:21:18 -07:00
b61555d7c0
Merge pull request #1582 from To1ne/pushdminus
...
use pushdminus
2013-04-23 20:16:41 -07:00
8fea507b5c
Merge pull request #1608 from swanandp/m_lion_terminal_same_tab_support
...
Mountain Lion Terminal App: Support for opening tabs and windows in the same folder.
2013-04-23 20:04:08 -07:00
30b0eb3ffa
Merge pull request #1740 from felipec/fc/git
...
git: fix parse_git_dirty()
2013-04-23 19:42:58 -07:00
e41714d72c
Added option to allow untracked files as non dirty
...
In this commit, the option only works for git but it should not be to hard for
someone who knows svn to so the same.
This commit is largely inspired by @yoavweiss, I only added an option to use
it.
2013-04-22 10:59:08 +02:00
d615f64374
git: fix parse_git_dirty()
...
If oh-my-zsh.hide-status is configured, the 'clean' code won't be
generated, and some themes might end up distorted. Let's generate the
'clean' code even when we don't want the show the dirty status.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
2013-04-21 02:56:39 -05:00
085af13b47
Merge pull request #1531 from lcosmin/master
...
Fixed 'ls' issue on NetBSD
2013-04-12 06:16:54 -07:00
cd55560c74
Merge pull request #1654 from bertag/parse-git-dirty-support-for-1.6
...
parse_git_dirty() support for Git 1.6
2013-04-07 19:06:31 -07:00
8890450684
This fixes checking for git untracked items
...
The grep expression was incorrect for normal grep. Adding
the `-E` option fixed the escaping of the question marks.
2013-04-03 20:41:05 -04:00
b8b241f630
Merge pull request #749 from blueyed/setopt-correct
...
Only `setopt correct`, not "correct_all".
2013-03-26 22:14:20 -07:00
5cde893ce0
Merge pull request #1661 from hellerbarde/master
...
Fix some problems with git enabled prompts where they *always* claim to have untracked files
2013-03-26 22:11:04 -07:00
a3a6b91818
Merge pull request #1616 from sxeraverx/master
...
pipe git version check error to /dev/null (for when git doesn't exist)
2013-03-26 21:56:35 -07:00
3826c7bf85
allow setting a custom HISTFILE before oh-my-zsh is loaded
2013-03-15 22:07:47 +01:00
56e835426b
fix git_prompt_status() to not say the repository has untracked files all the time
2013-03-14 00:31:14 +01:00
72ec24108a
Tweaked parse_git_dirty() in lib/git.zsh to support proper dirty/clean parsing against both git 1.6 and git 1.7+
2013-03-11 13:41:32 -06:00
3db22634a1
pipe git version check error to /dev/null (for when git doesn't exist)
2013-02-19 10:00:58 -08:00
fb3dc24ff4
Support for opening tabs and windows in the same This fixed #1498 for me on Mountain Lion
2013-02-14 14:07:58 +05:30
9245a30868
Did a full circle and went back to # On branch master
...
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: git.zsh
#, ignoring untracked files, which seems to be the primary cause for slowness
2013-02-13 17:14:43 +01:00
11576dd40b
Fixed dirty check to include files added to index
2013-02-13 11:28:13 +01:00
2595484a97
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/aliases.zsh
2013-02-08 19:08:06 +01:00
fe4c2379c4
use pushdminus
2013-02-04 22:21:34 +01:00
171a76a3c4
Closer to original status command, using SUBMODULE SYNTAX
2013-01-30 09:32:01 +01:00
2e213b9b8f
Faster dirty git status check (using git diff)
2013-01-27 14:50:33 +01:00
4c91f6d13e
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv into
...
oh-my-zsh.
2013-01-25 13:23:40 +02:00
9ef7e8a191
Merge pull request #1077 from Mezzle/add-option-to-show-git-status
...
Add option to disable status notification
2013-01-10 22:36:16 -08:00
e5736d3910
Fixed coding style
2013-01-03 14:44:17 +02:00
c5ecb4e136
Fixes #1489
...
Revert "Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes"
This reverts commit 8f89d4d5a5
2012-12-31 05:25:07 -08:00
fa355a798c
Fixed issue with NetBSD's ls
2012-12-31 14:02:22 +02:00
b9a989fea5
Add Stash toogle to display if there's some stash or not in `git_prompt_status`
2012-12-07 10:25:02 +01:00
78e3f38db7
Merge pull request #1258 from caio/git-branch-status
...
Add branch status support to git_prompt_status
2012-12-04 06:56:43 -08:00
5aed0aed4e
Merge pull request #875 from ttddyy/prompt_git-remove
...
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
d88fad3392
Merge pull request #880 from darrenclark/fix-mac-terminal-app-echo-issue
...
Fixed Mac OS X Terminal.app related issue with extra newlines echoed
2012-12-04 06:45:01 -08:00
421a738b49
Merge pull request #1273 from ystein/master
...
Typo in cd-wrapper
2012-12-04 06:36:45 -08:00
aa382b572e
Merge pull request #1255 from SuprDewd/master
...
Added a "please" alias for sudo
2012-12-02 12:44:17 -08:00
9977afc0b5
Merge pull request #1263 from tedv/headless-git
...
Make git use sha when branch name is missing.
2012-12-02 12:42:38 -08:00
2e5a689c05
Merge pull request #1265 from aletessier/ssh-completion
...
Fix ssh plugin completion
2012-12-02 12:42:08 -08:00
fe094712fb
resolving conflict in termsupport plugin
2012-12-02 12:30:46 -08:00
b2b77be56f
Merge pull request #1341 from markusscherer/master
...
fix title setting bug in xterm and urxvt
2012-12-02 12:27:04 -08:00
e10552b403
Merge pull request #1354 from F30/master
...
Set the '-R' option for less not in $PAGER, but as $LESS
2012-12-02 12:26:41 -08:00
1417111bad
Merge pull request #1453 from simonoff/master
...
new theme and rvm theming support
2012-12-02 12:20:31 -08:00
11ff3b642d
Removing mcd as it conflicts with mtools
2012-12-02 12:05:58 -08:00
77e4c1c9f1
Merge pull request #253 from loopj/master
...
Added function git_remote_status to lib/git.zsh which extracts if the local branch is ahead/behind/diverged from remote
2012-12-02 11:43:09 -08:00
27841ca7c1
Set default for rvm prompt prefix/suffix
2012-12-02 20:30:25 +02:00
30687c4147
Fix RVM loading and RVM ruby version info
2012-12-02 20:00:11 +02:00
5b2ca3875a
Improved statistics functions, effect:
...
1 1124 24.6006% c
2 985 21.5583% git
3 343 7.50711% rails
4 328 7.17881% cd
5 314 6.8724% rspec
6 257 5.62486% la
7 197 4.31167% rake
8 154 3.37054% s
9 109 2.38564% ..
10 95 2.07923% rvm
11 68 1.48829% guard
12 36 0.787919% bundle
13 29 0.634712% ssh
14 28 0.612826% pry
15 27 0.590939% open
16 26 0.569052% middleman
17 26 0.569052% gem
18 24 0.525279% rm
19 24 0.525279% heroku
20 23 0.503392% nvm
2012-11-14 19:09:13 +08:00
174c9177aa
Replace hardcoded key escape sequeneces with dynamic ones from terminfo.
2012-10-17 16:04:42 +02:00
ff0cafa14d
Make sure the terminal is always in application mode when zle is active.
2012-10-14 00:10:40 +02:00
3839c6e9e6
Don't clobber standard Esc+. behavior
...
Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
Conflicts:
lib/key-bindings.zsh
2012-10-13 23:50:40 +02:00
f7708d4181
forgot to save before committing. doh
2012-10-13 23:44:31 +02:00
68cec79d32
Added documentation to key bindings.
...
Conflicts:
lib/key-bindings.zsh
2012-10-13 23:43:55 +02:00
daa6ecebc1
Set the '-R' option for less not in $PAGER, but as $LESS.
2012-10-13 23:16:39 +02:00
43bd46b780
fix title setting bug in xterm and urxvt
...
Before this patch, commands containing %-signs set the title wrong
(urxvt and xterm) [1] and produce strange output in urxvt [2].
test for bug 1:
> sleep 10 && echo %
sets title to "sleep 10 && echo %<<"
> sleep 10 && echo %f
doesn't change the title at all
test for bug 2 (only urxvt):
> echo %f
39m%f
^^^^^----- output
2012-10-03 17:18:14 +02:00
a7fb668078
Make rvm prompt function a bit cleaner
2012-09-26 13:57:38 -07:00
3d1b788d8a
Fixing the rvm_prompt_info command, now it will not show empty parens if no rvm is currently being used
2012-09-26 13:56:37 -07:00
9172b3a89f
fix typo in cd-wrapper
2012-08-05 22:51:11 +03:00
9af7f86299
Correct variable used for global ssh known host completion
2012-08-01 23:58:09 +02:00
027fcccc92
Make git use sha when branch name is missing.
2012-07-31 13:27:40 -04:00
a3c2a2f6e8
Add branch status support to git_prompt_status
...
This patch makes git_prompt_status support three new status variables:
- ZSH_THEME_GIT_PROMPT_AHEAD
- ZSH_THEME_GIT_PROMPT_BEHIND
- ZSH_THEME_GIT_PROMPT_DIVERGED
With these extra variables it's easy to see (1) if you have commits in
your local branch that weren't pushed to the remote (AHEAD), (2) if
there are commits in the remote that you haven't merged/rebased yet
(BEHIND) or (3) if you have local unpushed commits AND the remote has
some commits you haven't merged yet (DIVERGED).
Refer to the first line displayed on `git status -b --porcelain`.
An example setup in a .zsh-theme file would be:
ZSH_THEME_GIT_PROMPT_AHEAD="↑"
ZSH_THEME_GIT_PROMPT_BEHIND="↓"
ZSH_THEME_GIT_PROMPT_DIVERGED="↕"
2012-07-29 20:18:26 +02:00
682961e930
Add a configuration option to disable autocorrect
2012-07-28 08:25:15 +10:00
75029cda2a
Added a "please" alias for sudo
2012-07-26 17:54:15 +00:00
772bc51c3a
Merge
2012-07-24 13:39:07 -07:00
8d23a36110
Merge branch 'master' of github.com:essembeh/oh-my-zsh
2012-06-27 00:12:55 +02:00
18cb11903f
Comment l alias
2012-06-27 00:12:21 +02:00
29fb24487c
Merge remote-tracking branch 'upstream/master'
2012-06-25 17:41:06 +02:00
4f9cfee9bd
avoid VCS folders
2012-06-14 08:06:36 +03:00
e8d582aba9
Merge pull request #977 from scialex/better-d
...
Make the 'd' alias only show the directories that can be cd'd to using the number aliases.
2012-06-13 13:25:00 -07:00
38d537f9e7
Merge pull request #984 from vmalloc/less_r_pager
...
Pager is 'less -R' to support colored outputs
2012-06-13 13:22:33 -07:00
f60244f8f4
Merge pull request #999 from ChaosData/master
...
Auto title now disabled in emacs term mode
2012-06-13 13:20:42 -07:00
e6c81a5893
Merge pull request #1019 from matschaffer/patch-1
...
Don't clobber standard Esc+. behavior
2012-06-13 13:09:45 -07:00
1bb715965c
Change hardcoded ~/.oh-my-zsh to $ZSH.
2012-06-12 10:18:02 +02:00
8f71efc09b
Add helper to easily define default values for variables and env variables.
2012-05-29 01:51:50 +02:00
dbef8b1a92
Add helper to get the value of an alias only
2012-05-29 01:49:52 +02:00
8ce35df2c5
Add option to disable status notification
...
For certain git repositories, this slows down usage
of the shell horifically.
This option can be set with
git config --add oh-my-zsh.hide-status 1
which will disable checking/showing the status notification
2012-04-18 11:45:22 +01:00
741388be00
Merge remote branch 'upstream/master'
...
Conflicts:
lib/completion.zsh
2012-04-12 19:28:59 +02:00
5f72c63136
Don't clobber standard Esc+. behavior
...
Esc+. works as "last arg" on both bash and zsh. Seems like a shame to introduce a new standard.
2012-03-17 22:03:01 -03:00
c7105a5341
Disabled title function for emacs term mode
2012-03-07 07:47:34 -05:00
19bf83e17d
Pager is 'less -R' to support colored outputs
2012-03-01 10:27:19 +02:00
d693711f14
made the 'd' alias only show the directories that can be cd'ed to using the number aliases
2012-02-28 13:52:57 -05:00
4e0b5be145
Fix spurious correction with sudo vim
...
user@host:~ $ sudo vim /etc/rc.conf
zsh: correct 'vim' to '.vim' [nyae]?
http://www.zsh.org/mla/users/2012/msg00028.html
2012-02-23 23:12:07 -08:00
5a5c93b334
Fixed bug introduced when fixing issue 896
2012-02-21 10:47:05 -05:00
a9f6aed307
fixed introduced to parse_git_dirty
2012-02-08 15:30:58 -05:00
7ea758834b
changed variable PRE_1_7_2_GIT to POST_1_7_2_GIT to make it more accurate
2012-02-08 15:25:12 -05:00
dc4d7a92c1
fixed asterisk display for modified repos in git prior to 1.7.2
2012-02-08 15:19:12 -05:00
fbf5b0ecb6
add default rbenv_prompt_info implementation to close #878
2012-02-06 21:50:17 -05:00
8f89d4d5a5
Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes
2012-01-27 01:20:06 -07:00
8769e5f8c9
Removed trailing spaces in Git files. Fixes #867
2012-01-26 23:19:50 -08:00
52733cb3bb
prompt git-remove as deleted
2012-01-26 15:20:08 -08:00
cb501645d7
Get the Hostname
...
Main library should use ZSH native hostname function
2011-12-30 12:11:41 -06:00
b29602e661
Merge pull request #764 from Fl4t/submodules
...
Ignore submodules dirty in prompt info
2011-12-26 10:05:51 -08:00
2b86624951
Merge pull request #772 from indrajitr/master
...
Fix upgrade and uninstall functions to pick up $ZSH value
2011-12-26 10:04:59 -08:00
0b583638ae
Fix upgrade and uninstall functions to pick up $ZSH value
2011-12-25 19:53:55 +05:30
d8521693f4
Added support for entries in /etc/ssh/ssh_known_hosts.
2011-12-22 14:02:01 -05:00
dd14e075b7
Ignore submodules dirty in prompt info
2011-12-21 15:03:55 +01:00
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
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
3726611275
Merge remote branch 'upstream/master'
2011-12-15 16:15:23 +01:00
d1b6423f2f
Merge pull request #732 from ggustafsson/patch-1
...
Removed duplicate setting and sorted the remaining
2011-12-14 21:59:37 -08:00
3fc812afc9
Removed duplicate setting and sorted the remaining
2011-12-03 13:18:37 +01:00
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
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
762b55bb2b
Merge pull request #490 from hwti/428f18cf428fd86bd6e99c4363e5f25d0e392506
...
Add key bindings for gnome-terminal on Fedora
2011-08-30 21:09:36 -07:00
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
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
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
0ba398f9e1
Merge in recent stuff
2011-08-01 00:44:51 -07:00
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
fc49b4a4de
Enable red dots during completion by default
2011-07-28 19:52:53 +02:00
0848acfb25
Display red dots during completion process (disabled by default)
2011-07-24 21:48:21 +02:00
428f18cf42
Add key bindings for gnome-terminal on Fedora
2011-07-23 23:09:03 +02:00
46440e7198
Merge pull request #208 from sorin-ionescu/plugin-extract
...
extract plugin
2011-07-23 09:33:42 -07:00
5e4d89385f
Merge branch 'master' of github.com:robbyrussell/oh-my-zsh
2011-07-23 09:13:57 -07:00
eb63ddf6bb
added mac keybinding for backward-delete-char
2011-07-23 09:11:08 -07:00
ae9457d84d
Merge pull request #487 from dreur/upstream-spectrum-utility
...
Add utility method to spectrum
2011-07-23 08:58:10 -07:00
34f00f385c
More generic.
2011-07-23 08:54:47 -07:00
cbaa97d8c3
Add utility method to spectrum
2011-07-23 11:09:45 -04:00
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
6774fb3d59
Minor corrections to deletion detection in git_prompt_status
2011-07-13 23:23:01 -07:00
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
1db6575f14
Added extract plugin.
2011-06-01 20:33:16 -04:00
c014dca141
Fix deleted in git.zsh
2011-05-31 15:59:38 -07:00
a81b0171cc
Merge pull request #196 from asymmetric/master
...
Add missing flag to unrar
2011-05-26 01:13:18 -07:00
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
4f71818a8b
Merge pull request #329 from juanghurtado/master
...
Support for $(current_branch) on git_parse_ahead()
2011-05-13 02:48:50 -07:00
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
e3cede37a0
Relax pattern matching on TERM. Closes #320 .
2011-05-02 13:51:16 +02:00
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
655e6e8df0
Merge remote branch 'upstream/master'
...
Conflicts:
plugins/github/github.plugin.zsh
2011-04-20 01:29:58 -04:00
7d9628b2dc
Added bindings for Gnome terminal.
2011-04-19 22:40:46 -04:00
c7c959de60
Make the delete key work correctly, instead of outputting a ~
2011-04-19 19:01:18 -04:00
16ac094a43
Moved compinit call back to oh-my-zsh.sh, after plugins are loaded
2011-04-12 09:28:15 -04:00
8883ace767
Revert "Enable alias completion, do not limit completion to just files"
...
This reverts commit c3a58b0004
2011-04-12 10:24:06 +02:00
ef4175981b
Moved the single compinit call from oh-my-zsh.sh to lib/completion.zsh
2011-04-08 11:10:14 -04:00
993e05da50
Replace redundant calls to compinit with a single call.
2011-04-08 10:12:22 -04:00
0cc0915bf8
Refactor DISABLE_AUTO_TITLE to be more DRY
2011-04-04 14:02:50 +02:00
a3e92892bb
Command title behavior no longer depend on local zsh configuration
...
Fix by derekjw. closes #52 .
2011-04-04 13:56:00 +02:00
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
06063ab695
Introduce DISABLE_AUTO_TITLE option
2011-03-23 21:20:08 -07:00
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
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