194 commits

Author	SHA1	Message	Date
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
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
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
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
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	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
Ted Vessenes	027fcccc92	Make git use sha when branch name is missing.	2012-07-31 13:27:40 -04:00
Caio Romão	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
Bjarki Ágúst Guðmundsson	75029cda2a	Added a "please" alias for sudo	2012-07-26 17:54:15 +00:00
James Smith	772bc51c3a	Merge	2012-07-24 13:39:07 -07:00
Robby Russell	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
Robby Russell	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
Robby Russell	f60244f8f4	Merge pull request #999 from ChaosData/master ... Auto title now disabled in emacs term mode	2012-06-13 13:20:42 -07:00
Robby Russell	e6c81a5893	Merge pull request #1019 from matschaffer/patch-1 ... Don't clobber standard Esc+. behavior	2012-06-13 13:09:45 -07:00
s3	1bb715965c	Change hardcoded ~/.oh-my-zsh to $ZSH.	2012-06-12 10:18:02 +02:00
Martin Meredith	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
Mat Schaffer	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
Jeffrey Dileo	c7105a5341	Disabled title function for emacs term mode	2012-03-07 07:47:34 -05:00
Rotem Yaari	19bf83e17d	Pager is 'less -R' to support colored outputs	2012-03-01 10:27:19 +02:00
Alex Light	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
cruser42	5a5c93b334	Fixed bug introduced when fixing issue 896	2012-02-21 10:47:05 -05:00
Aleksey Orekhov	a9f6aed307	fixed introduced to parse_git_dirty	2012-02-08 15:30:58 -05:00
Aleksey Orekhov	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
Aleksey Orekhov	dc4d7a92c1	fixed asterisk display for modified repos in git prior to 1.7.2	2012-02-08 15:19:12 -05:00
Darren Clark	8f89d4d5a5	Fixed Mac OS X Terminal.app related issue with extra newlines being printed out sometimes	2012-01-27 01:20:06 -07:00