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

513 commits

Author SHA1 Message Date
Gaetan Semet
316c46767e Merge remote-tracking branch 'upstream/master' 
Conflicts:
	tools/install.sh
 2014-04-23 14:45:49 +02:00
tcasparro
53323abdb1 Added git mode support for merging, rebasing, and bisecting 
<B> Designates Bisecting
>M< Designates Merging
>R> Designates Rebasing
 2014-03-26 10:37:56 -07:00
Gaetan Semet
5afa441d66 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	templates/zshrc.zsh-template
 2014-03-24 11:54:41 +01:00
Robby Russell
ae1a9e25a1 Merge pull request #995 from wting/fix_gnzh_ruby_detection 
Fix gnzh theme to detect local rvm installations
 2014-03-22 15:40:00 -07:00
Kory Prince
d3babe0d79 Don't show useless '[]' when chruby_prompt_info is empty 2014-03-17 11:02:47 -05:00
Gaetan Semet
4888217c85 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	README.textile
	lib/aliases.zsh
	templates/zshrc.zsh-template
	tools/install.sh
 2014-03-14 16:50:51 +01:00
Robby Russell
ee21fe9447 Merge pull request #2380 from rkh/chruby-gallois 
add chruby info to gallois theme
 2014-03-13 16:18:55 -07:00
Robby Russell
8d8df3fd7a Merge pull request #2435 from tompelka/master 
Adding commit hash to branch name in my favorit rjk-repos theme.
 2014-03-13 16:18:30 -07:00
Robby Russell
d943d23aa0 Merge pull request #2466 from jarus/steeef-virtualenv-fix 
Improve virtualenv prompt in steeef theme
 2014-03-13 16:18:06 -07:00
Robby Russell
07c2bdf45d Merge pull request #2588 from kerimdzhanov/remote-themes-copyright-info 
Remove all copyright information in themes. Closes #2587
 2014-03-13 16:15:51 -07:00
Robby Russell
86a272ef81 Merge pull request #2596 from ryanwmarsh/fixing_bureau_scrollback 
Fixes #2467 tab completion scrolls back in terminal when using bureau
 2014-03-11 07:44:30 -07:00
Ryan Marsh
c3c8cc318d Fixes #2467 tab completion scrolls back in terminal when using bureau theme 2014-03-10 18:36:51 -05:00
Dan Kerimdzhanov
c249c69065 Remove all copyright information in themes. Closes #2587 2014-03-08 23:51:59 +06:00
Robby Russell
e744bf22ca Merge pull request #2479 from mrbfrank/theme-agnoster 
theme agnoster: update characters to match latest powerline fonts
 2014-03-08 08:39:54 -08:00
Robby Russell
ae9a9b7f70 Merge pull request #2481 from felds/master 
highlight the username when root
 2014-03-08 08:15:29 -08:00
Robby Russell
2208854597 Cleaning up conflict with merge of #2330 2014-03-08 08:02:23 -08:00
Felds Liscia
4d83da770a highlight the username when root 2014-01-30 15:15:57 -02:00
mrbfrank
685ea4a361 theme agnoster: remove trailing space 
re-implemented expired pull request https://github.com/robbyrussell/oh-my-zsh/pull/1759
 2014-01-29 13:35:21 -06:00
mrbfrank
7daaa188da corrected branch character 
changed ± to 
 2014-01-28 21:54:00 -06:00
mrbfrank
78ffa71cb6 updated url to latest powerline-patched fonts 
clearing up some confusion in issue#1906
 2014-01-28 18:02:40 -06:00
Christoph Heer
3d41804fbc Improve virtualenv prompt in steeef theme 2014-01-24 23:01:35 +01:00
Gaetan Semet
43da92c071 Merge remote-tracking branch 'upstream/master' 2014-01-18 12:09:59 +01:00
Tomas Pelka
23e57c177c Adding commit hash to branch name in my favorit rjk-repos theme. 2014-01-16 12:15:41 +01:00
Daniele
3e5e2d45e9 Fix bad right prompt placing. 2013-12-31 12:41:28 +01:00
Konstantin Haase
f6bb74e452 add chruby info to gallois theme 2013-12-27 14:25:06 +01:00
Andy Fleming
c05a28a7d9 typo fix 2013-12-10 00:11:22 +00:00
Andy Fleming
cbd63f220d Fix for virtualenv support - fixes #2328, fixes #2297, resolves #2319 2013-12-09 19:38:27 +00:00
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
cd219f70a4 Merge pull request #1520 from prooftechnique/master 
add symbol in darcs repos to match git and mercurial (smt theme)
 2013-12-02 23:55:46 -08:00
Robby Russell
f974fa31dc Merge pull request #1574 from adben/master 
updated theme adben
 2013-12-02 23:55:25 -08:00
Robby Russell
a762b3e85b Merge pull request #1683 from mnme/master 
replace hostname -s with hostname in ys theme for compatibility
 2013-12-02 23:54:12 -08:00
Robby Russell
533e31f2cc Merge pull request #1956 from emesix/patch-1 
Update jonathan.zsh-theme
 2013-12-02 23:32:56 -08:00
Robby Russell
3ff772d68b Merge pull request #2022 from Zhann/master 
Updates Zhann theme
 2013-12-02 23:30:25 -08:00
Robby Russell
bbadcf77e3 Merge pull request #2034 from kasperisager/master 
Add Pure theme
 2013-12-02 23:27:45 -08:00
Robby Russell
b38db4a2d2 Merge pull request #2097 from natecox/master 
Added virtualenv plugin data to af-magic theme.
 2013-12-02 23:26:03 -08:00
Robby Russell
4fc0806123 Merge pull request #1030 from solnic/master 
[themes/josh] Use $(current_branch) in prompt
 2013-12-02 23:21:41 -08:00
Robby Russell
7a6caf679a Merge pull request #950 from sonicradish/master 
sonicradish - 256 color oh-my-zsh theme [dark/solarized]
 2013-12-02 23:19:10 -08:00
Robby Russell
1badb744bf Merge pull request #948 from excepttheweasel/master 
Added peepcode theme
 2013-12-02 23:18:31 -08:00
Robby Russell
1c185f0055 Merge pull request #946 from rach/master 
Little tweak on the robbyrussell.zsh-theme
 2013-12-02 23:17:25 -08:00
Robby Russell
4954335b64 Merge pull request #781 from pilif/two-lined-pygmalion 
make pygmalion theme use two lines when needed
 2013-12-02 23:15:19 -08:00
Robby Russell
2a43c5eebd Merge pull request #684 from masnick/master 
Update to fino.zsh-theme
 2013-12-02 23:11:10 -08:00
Robby Russell
07594af171 Merge pull request #639 from MarcoPeraza/git_unpushed 
Show if you're ahead of remote in the wedisagree theme
 2013-12-02 23:08:37 -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
Gaetan Semet
6a58e4c8e9 Merge remote-tracking branch 'upstream/master' 2013-12-02 15:20:36 +01:00
Dhruva Sagar
3d851daf45 Added Amuse zsh theme 2013-11-29 12:28:52 +05:30
Gaetan Semet
1a5e47a9ad Merge remote-tracking branch 'upstream/master' 2013-11-18 14:54:31 +01:00
Eddie Monge
3930a63253 no tabs in a space-d file 2013-11-14 16:17:23 -08:00
Robby Russell
7a7eda1287 Merge pull request #2219 from Profpatsch/theme-agnoster 
Forgot one symbol for hg.
 2013-11-13 13:28:44 -08:00
Robby Russell
8ab841116b Merge pull request #2218 from wari/linuxonly-rename 
`linuxonly` doesn't work unless renamed properly
 2013-11-12 19:40:09 -08:00