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,441 commits 3 branches 0 tags 154 MiB
Commit graph

270 commits

Author SHA1 Message Date
Gaetan Semet
24f2838f0b Merge remote-tracking branch 'upstream/master' 
Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/repo/repo.plugin.zsh
	templates/zshrc.zsh-template
	themes/ys.zsh-theme
 2013-12-03 09:41:48 +01:00
Robby Russell
f0a7adcd3d Merge pull request #2176 from dejanlukan/spectrum 
Added the spectrum_bls function, which prints all 256 colors set as the background.
 2013-12-03 00:18:17 -08:00
Robby Russell
1dd9c43e12 Merge pull request #1134 from koraa/pull_req_helpers 
Helpers for default variables and alias value access
 2013-12-02 23:47:21 -08:00
Robby Russell
44c7fd976b Merge pull request #1928 from dongweiming/add-hist-stamp 
Add option for show in the command execution time stamp in the history
 2013-12-02 23:38:26 -08:00
Robby Russell
273728901e Merge pull request #513 from randy909/fix-edit-cmdline 
Fix edit-command-line binding
 2013-12-02 23:03:03 -08:00
Robby Russell
fb614a0e80 Merge pull request #2229 from prubianes/master 
Bazaar Integration Lib
 2013-12-02 22:37:28 -08:00
Robby Russell
9357f2f41d Merge pull request #2236 from Isquariel/nvm 
Added function to show current Node.js version and new Bureau theme
 2013-12-02 22:35:41 -08:00
Robby Russell
ac838345f5 Merge pull request #2270 from michaelorr/slow-git-fix 
Optionally disable git_prompt_info with git config option for very large repos
 2013-12-02 22:28:11 -08:00
Gaetan Semet
6a58e4c8e9 Merge remote-tracking branch 'upstream/master' 2013-12-02 15:20:36 +01:00
Michael Orr
fbd479b68e adding a check for git config option to disable git_prompt_info() on a per repo basis 2013-11-20 12:30:55 -05:00
Gaetan Semet
412a38a989 Merge remote-tracking branch 'cadusk/master' 
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
 2013-11-18 14:57:43 +01:00
Petter Abrahamsson
a7540844d5 Add support for colored ls output on OpenBSD 2013-11-14 07:06:54 -05:00
Carlos Cardoso
422a4224fb customzing defaults. 2013-11-13 00:31:10 -02:00
isquariel
5c73cb671b Added nvm.zsh to detect current Node.js version 2013-11-08 23:26:05 +04:00
Pablo Rubianes
efc37c1f71 Modification to the frisk theme to work with the BZR lib 2013-11-06 20:10:59 -02:00
dejan
f057737e57 Added the spectrum_bls function, which prints all 256 colors set as the 
background.

We can easily see which color we want to set when changing the PS1 shell variable,
since the colors are more distinctive.
 2013-10-16 12:36:48 +02:00
Benjamin Chrétien
c638f9d7fd Get number of lines changed for Git 2013-07-17 10:06:24 +02:00
Carlos Cardoso
b5205c12d4 Merge remote-tracking branch 'upstream/master' 
* upstream/master: (41 commits)
  fixed typo in tmux plugin
  Update coffee completion
  The current version of bower is completely unavailable, plugin depth modification
  rvm plugin: update to ruby version helpers and rvm-update
  Change duplicated alias name
  Add autocompletion for Rails3.
  Add more capable hg incoming and outgoing count handling
  Add celery completion
  add virtualenv prompt support for agnoster theme
  git-pull add --rebase option
  Typo
  Prevent starting multiple gpg-agents
  Not loading home tmux confs when iTerm2 tmux integration is enabled
  Adding support for iTerm2 tmux integration via option '-CC'
  remove unused function
  autocomplete required packages as second argumet
  debian plugin: ignore alias in sudo/aptitude check
  Add new plugin for homebrew installed version of postgres
  Do not clear tab when calling it with an argument.
  Correctly detect Rapid Board
  ...
 2013-07-12 14:26:59 -03:00
dongweiming
77cf869605 Add option for show in the command execution time stamp in the history 2013-06-30 20:54:23 +08:00
Gaetan Semet
e646ee6caa Merge remote-tracking branch 'upstream/master' 
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/repo/repo.plugin.zsh
 2013-06-26 17:24:11 +02:00
Robby Russell
4f8d6a8b15 Merge pull request #1773 from essembeh/master 
Uncomment l alias
 2013-06-25 09:10:05 -07:00
Gaetan Semet
b77ccd7c8f Merge remote-tracking branch 'upstream/master' 2013-06-25 15:39:23 +02:00
Robby Russell
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
Gaetan Semet
31f1e2202a Merge remote-tracking branch 'upstream/master' 2013-06-18 11:54:16 +02:00
Gaetan Semet
60f4ae1bed Merge remote-tracking branch 'cadusk/master' 
Conflicts:
	templates/zshrc-linux.zsh
	templates/zshrc-mac.zsh
	templates/zshrc.zsh-template
 2013-06-13 17:13:13 +02:00
Theodore Kokkoris
9703eba66e Fixed slow behavior when using GitHub wrappers 2013-06-12 20:04:08 +03:00
Ehren Kret
ab7604e5c2 Escape both % and $ in the command line 
Fixes issue #1884
 2013-06-11 11:37:35 -07:00
Gaetan Semet
781364a35a Merge remote-tracking branch 'upstream/master' 
Conflicts:
	lib/theme-and-appearance.zsh
	plugins/tmux/tmux.plugin.zsh
 2013-06-05 11:10:38 +02:00
Gaetan Semet
1959f579e1 Add rebase flag in prompt 
Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
 2013-06-05 11:02:49 +02:00
Carlos Cardoso
ee3267f30d Merged official branch changes. 2013-06-03 22:12:29 -03:00
Christopher Roach
4ff861ee11 Adding a fix for the DISABLE_UNTRACKED_FILES_DIRTY option. 2013-05-19 12:55:10 -07:00
Sébastien M-B
f77a545a4b Uncomment l alias 2013-04-28 16:34:36 +02:00
Robby Russell
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
Robby Russell
8890df1251 Merge pull request #922 from sbfaulkner/master 
patch rbenv support for themes
 2013-04-23 20:57:24 -07:00
Robby Russell
81ed0c4115 Resolving conflict with merge of #970 2013-04-23 20:44:35 -07:00
Robby Russell
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
Robby Russell
a2c8db9eb3 Resolving conflict in #1266 merge 2013-04-23 20:30:21 -07:00
Robby Russell
7cdb6d667c Resolving conflict when merging in 1570 2013-04-23 20:21:18 -07:00
Robby Russell
b61555d7c0 Merge pull request #1582 from To1ne/pushdminus 
use pushdminus
 2013-04-23 20:16:41 -07:00
Robby Russell
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
Robby Russell
30b0eb3ffa Merge pull request #1740 from felipec/fc/git 
git: fix parse_git_dirty()
 2013-04-23 19:42:58 -07:00
Jeremy Attali
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
Felipe Contreras
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
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
Stibbons
90b22743e3 Update lib/aliases.zsh 
Added new custom aliases
 2013-03-27 10:11:45 +01:00
Carlos Cardoso
7a34d01628 Fixed aliases and theme appearance. 2013-03-27 10:10:33 +01:00
Carlos Cardoso
eda24dcb75 My zsh config 2013-03-27 10:04:53 +01: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