Robby Russell
085af13b47
Merge pull request #1531 from lcosmin/master
...
Fixed 'ls' issue on NetBSD
2013-04-12 06:16:54 -07:00
Robby Russell
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
Christian Höltje
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
Robby Russell
b8b241f630
Merge pull request #749 from blueyed/setopt-correct
...
Only `setopt correct`, not "correct_all".
2013-03-26 22:14:20 -07:00
Robby Russell
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
Robby Russell
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
Flavius Aspra
3826c7bf85
allow setting a custom HISTFILE before oh-my-zsh is loaded
2013-03-15 22:07:47 +01:00
Philip Stark
56e835426b
fix git_prompt_status() to not say the repository has untracked files all the time
2013-03-14 00:31:14 +01:00
bertag
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
Thomas Minor
3db22634a1
pipe git version check error to /dev/null (for when git doesn't exist)
2013-02-19 10:00:58 -08:00
Swanand Pagnis
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
Yoav Weiss
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
Yoav Weiss
11576dd40b
Fixed dirty check to include files added to index
2013-02-13 11:28:13 +01:00
Sébastien M-B
2595484a97
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
lib/aliases.zsh
2013-02-08 19:08:06 +01:00
Toon Claes
fe4c2379c4
use pushdminus
2013-02-04 22:21:34 +01:00
Yoav Weiss
171a76a3c4
Closer to original status command, using SUBMODULE SYNTAX
2013-01-30 09:32:01 +01:00
Yoav Weiss
2e213b9b8f
Faster dirty git status check (using git diff)
2013-01-27 14:50:33 +01:00
Serdar Dalgıç
4c91f6d13e
Add autoenv plugin, which adopts using Kenneth Reitz's autoenv into
...
oh-my-zsh.
2013-01-25 13:23:40 +02:00
Robby Russell
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
Cosmin Lu?ă
e5736d3910
Fixed coding style
2013-01-03 14:44:17 +02:00
Robby Russell
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
Cosmin Lu?ă
fa355a798c
Fixed issue with NetBSD's ls
2012-12-31 14:02:22 +02:00
MAD
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
Robby Russell
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
Robby Russell
5aed0aed4e
Merge pull request #875 from ttddyy/prompt_git-remove
...
prompt git-rm as deleted
2012-12-04 06:45:17 -08:00
Robby Russell
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
Robby Russell
421a738b49
Merge pull request #1273 from ystein/master
...
Typo in cd-wrapper
2012-12-04 06:36:45 -08:00
Robby Russell
aa382b572e
Merge pull request #1255 from SuprDewd/master
...
Added a "please" alias for sudo
2012-12-02 12:44:17 -08:00
Robby Russell
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
Robby Russell
2e5a689c05
Merge pull request #1265 from aletessier/ssh-completion
...
Fix ssh plugin completion
2012-12-02 12:42:08 -08:00
Trae Robrock
fe094712fb
resolving conflict in termsupport plugin
2012-12-02 12:30:46 -08:00
Robby Russell
b2b77be56f
Merge pull request #1341 from markusscherer/master
...
fix title setting bug in xterm and urxvt
2012-12-02 12:27:04 -08:00
Robby Russell
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
Robby Russell
1417111bad
Merge pull request #1453 from simonoff/master
...
new theme and rvm theming support
2012-12-02 12:20:31 -08:00
Robby Russell
11ff3b642d
Removing mcd as it conflicts with mtools
2012-12-02 12:05:58 -08:00
Robby Russell
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
Alexander Simonov
27841ca7c1
Set default for rvm prompt prefix/suffix
2012-12-02 20:30:25 +02:00
Alexander Simonov
30687c4147
Fix RVM loading and RVM ruby version info
2012-12-02 20:00:11 +02:00
CHH
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
Felix Dreissig
174c9177aa
Replace hardcoded key escape sequeneces with dynamic ones from terminfo.
2012-10-17 16:04:42 +02:00
Felix Dreissig
ff0cafa14d
Make sure the terminal is always in application mode when zle is active.
2012-10-14 00:10:40 +02:00
Mat Schaffer
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
Kyle West
f7708d4181
forgot to save before committing. doh
2012-10-13 23:44:31 +02:00
Kyle West
68cec79d32
Added documentation to key bindings.
...
Conflicts:
lib/key-bindings.zsh
2012-10-13 23:43:55 +02:00
Felix Dreissig
daa6ecebc1
Set the '-R' option for less not in $PAGER, but as $LESS.
2012-10-13 23:16:39 +02:00
Markus Scherer
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
Trae Robrock
a7fb668078
Make rvm prompt function a bit cleaner
2012-09-26 13:57:38 -07:00
Trae Robrock
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
Yannik Stein
9172b3a89f
fix typo in cd-wrapper
2012-08-05 22:51:11 +03:00
Alexis Letessier
9af7f86299
Correct variable used for global ssh known host completion
2012-08-01 23:58:09 +02:00