aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' of github.com:bhilburn/powerlevel9k into nextBen Hilburn2017-05-231-7/+10
|\
| * Merge pull request #531 from shibumi/nextBen Hilburn2017-05-231-2/+2
| |\
| | * swapped colors for virtualization detection, black on yellow was pain for the...Christian Rebischke2017-05-211-2/+2
| * | Merge pull request #526 from docwhat/pr/nvm-currentBen Hilburn2017-05-231-5/+8
| |\ \
| | * | nvm: improve default detectionChristian Höltje2017-05-131-5/+8
| | |/
* | | Merge branch 'master' into nextBen Hilburn2017-05-231-1/+1
|\ \ \ | |/ / |/| |
| * | Merge branch 'moxon6-master'Ben Hilburn2017-05-231-1/+1
| |\ \
| | * | Make Anaconda environment status match Virtualenv formatMartin Moxon2017-05-171-1/+1
| |/ /
* | | Updating the README to add a note about `teardown` feature.Ben Hilburn2017-05-231-0/+15
* | | Fixing typo in #525 to teardown `RPROMPT`Ben Hilburn2017-05-231-1/+1
* | | Merge branch 'pr/teardown' of https://github.com/docwhat/powerlevel9k into do...Ben Hilburn2017-05-231-0/+7
|\ \ \
| * | | teardown: reset PROMPT and RPROMPTChristian Höltje2017-05-131-0/+2
| * | | add function to disable powerlevel9kChristian Höltje2017-05-131-0/+5
| | |/ | |/|
* | | Incorporating @dritter's feedback from #524.Ben Hilburn2017-05-233-8/+9
* | | Merge branch 'pr/newline' of https://github.com/docwhat/powerlevel9k into doc...Ben Hilburn2017-05-233-4/+34
|\ \ \
| * | | newline: support PROMPT_ON_NEWLINEChristian Höltje2017-05-132-6/+14
| * | | newline: can't work with right sideChristian Höltje2017-05-132-6/+5
| * | | newline: add new segmentChristian Höltje2017-05-132-0/+23
| |/ /
* | | Merge pull request #515 from docwhat/pr/pipe-statusBen Hilburn2017-05-232-2/+24
|\ \ \ | |/ / |/| |
| * | pipestatus: default to true (on)Christian Höltje2017-05-132-2/+2
| * | status: add option for support pipesChristian Höltje2017-05-132-2/+24
|/ /
* | Merge branch 'master' into nextBen Hilburn2017-05-101-1/+1
|\|
| * Merge pull request #519 from docwhat/pr/readme-typoBen Hilburn2017-05-101-1/+1
| |\
| | * readme: typoChristian Höltje2017-05-041-1/+1
| |/
* | Merge pull request #521 from guixxx/develBen Hilburn2017-05-103-5/+13
|\ \
| * | Icons for Windows/Cygwin + Refixes 32-bit supportguixxx2017-05-073-5/+13
| |/
* | Merge branch 'master' into nextBen Hilburn2017-05-031-1/+1
|\|
| * Merge pull request #513 from belak/belak/prompt-crBen Hilburn2017-05-031-1/+1
| |\
| | * Make sure prompt_cr is setKaleb Elwert2017-05-031-1/+1
| |/
* | Updates to README and CHANGELOG for changes from #498.Ben Hilburn2017-05-022-15/+23
* | Merge branch 'battery' of https://github.com/onaforeignshore/powerlevel9k int...Ben Hilburn2017-05-022-6/+67
|/
* Merge pull request #502 from shibumi/detect-virt-debuggingBen Hilburn2017-04-241-4/+3
|\
| * [detect-virt] quickfix for unnecessary information in promptChristian Rebischke2017-04-231-4/+3
|/
* Updating CHANGELOG for v0.6.3.Ben Hilburn2017-04-211-0/+8
* Merge branch 'master' into nextBen Hilburn2017-04-211-1/+1
|\
| * Merge pull request #494 from belak/better-realpathBen Hilburn2017-04-201-2/+2
| |\
| | * Use method built in to zsh to read symlinksKaleb Elwert2017-04-191-2/+2
| |/
* | Merge pull request #496 from belak/options-odditiesBen Hilburn2017-04-201-6/+10
|\ \
| * | Stop setting options in prompt setup which are thrown awayKaleb Elwert2017-04-201-8/+6
| * | Add prompt_opts to prompt setup functionKaleb Elwert2017-04-201-0/+6
|/ /
* | Merge branch 'master' into nextBen Hilburn2017-04-190-0/+0
|\|
| * Revert "Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerl...Ben Hilburn2017-04-191-5/+5
| * Merge branch 'fix-pw3nage-exploit' of https://github.com/belak/powerlevel9k i...Ben Hilburn2017-04-191-5/+5
| |\
| | * Fix double expansion of prompt variablesKaleb Elwert2017-04-191-5/+5
* | | Fix double expansion of prompt variablesKaleb Elwert2017-04-191-5/+5
* | | Merge pull request #484 from shibumi/svn-debuggingBen Hilburn2017-04-191-0/+6
|\ \ \
| * | | [SVN] removed %b identifier to fix color encodingChristian Rebischke2017-04-161-0/+6
* | | | Merge branch 'master' into nextBen Hilburn2017-04-192-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #483 from changyuheng/pr-status-tick-colorBen Hilburn2017-04-191-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Set tick to color name green instead of color codeHenry Chang2017-04-161-1/+1
| |/ /