summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Added documentation.Dominik Ritter2015-10-201-1/+11
* Merge branch 'next' into ram_promptDominik Ritter2015-10-202-74/+96
|\
| * Merge branch 'master' into nextBen Hilburn2015-10-181-2/+2
| |\
| | * README: Updating second image to use @natemccurdy awesome gif.Ben Hilburn2015-10-181-2/+2
| * | Merge pull request #118 from dritter/whitespace_customizationBen Hilburn2015-10-181-7/+9
| |\ \
| | * | Made whitespaces between segment separators customizable.Dominik Ritter2015-10-161-7/+9
| | |/
| * | README: Updating the docs about `vi_mode` segment.Ben Hilburn2015-10-181-21/+9
| * | Merge pull request #117 from dritter/vi_customizationsBen Hilburn2015-10-182-2/+10
| |\ \
| | * | vi_mode segement more customizable.Dominik Ritter2015-10-162-2/+10
| | |/
| * | Merge branch 'dritter-vcs_cleanup' into nextBen Hilburn2015-10-181-47/+45
| |\ \
| | * | Merge branch 'vcs_cleanup' of https://github.com/dritter/powerlevel9k into dr...Ben Hilburn2015-10-181-47/+45
| |/| |
| | * | Merge remote-tracking branch 'ben/next' into vcs_cleanupDominik Ritter2015-10-162-430/+95
| | |\|
| | * | Cleanup of VCS-segment. Now `vcs_info` is only invoked, if the user configure...Dominik Ritter2015-10-111-47/+45
| * | | Merge pull request #114 from alexlafroscia/add-nvm-prompt-segmentBen Hilburn2015-10-182-0/+12
| |\ \ \
| | * | | Add note about NVM to the readmeAlex LaFroscia2015-10-141-0/+1
| | * | | Add NVM prompt segmentAlex LaFroscia2015-10-141-0/+11
| | | |/ | | |/|
| * | | Merge pull request #120 from partp/fix-virtualenvBen Hilburn2015-10-181-1/+1
| |\ \ \
| | * | | Fixes `VIRTUAL_ENV_DISABLE_PROMPT` conditionParth Panchal2015-10-171-1/+1
| | |/ /
| * | | README: changing name of `todo.txt` segment to `todo`Ben Hilburn2015-10-181-1/+1
| * | | reverting unnoticed white space changerjorgenson2015-10-171-1/+1
| * | | added prompt segment for todo.txt task numberrjorgenson2015-10-172-1/+15
| |/ /
* | | Merge remote-tracking branch 'ben/next' into ram_promptDominik Ritter2015-10-162-430/+95
|\| |
| * | Merge branch 'readme-v2' into nextBen Hilburn2015-10-131-428/+94
| |\ \
| | * | README: one more wiki link to ToCBen Hilburn2015-10-131-0/+2
| | * | README: Add link to Wiki at end of READMEBen Hilburn2015-10-131-0/+6
| | * | README: Cleaning up ToCBen Hilburn2015-10-131-5/+6
| | * | README: Final cleanupBen Hilburn2015-10-131-5/+5
| | * | README: Moving styling to the wikiBen Hilburn2015-10-131-121/+8
| | * | README: I'm good at markdownBen Hilburn2015-10-131-3/+3
| | * | README: Adding ToCBen Hilburn2015-10-131-0/+6
| | * | README: Fixing install instruction bulletsBen Hilburn2015-10-131-0/+1
| | * | README: cleanupBen Hilburn2015-10-131-29/+7
| | * | README: Fixing some segment linksBen Hilburn2015-10-131-9/+9
| | * | README: Creating links for each segment sectionBen Hilburn2015-10-131-60/+18
| | * | README: moving lots of information to the WikiBen Hilburn2015-10-131-244/+71
| | |/
| * | Merge pull request #109 from jkoelndorfer/nextBen Hilburn2015-10-121-2/+1
| |\ \ | | |/ | |/|
| | * Quote value of IS_BSD_SED.John Koelndorfer2015-10-061-2/+1
| |/
* | Merge branch 'ram_prompt' of github.com:dritter/powerlevel9k into ram_promptDominik Ritter2015-10-011-25/+26
|\ \
| * | Alphabetical order.Dominik Ritter2015-09-261-43/+44
| * | Corrected calculation of used swap under linux.Dominik Ritter2015-09-261-1/+1
* | | Merge branch 'next' into ram_promptDominik Ritter2015-09-302-107/+192
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #108 from V1rgul/nextBen Hilburn2015-09-291-25/+41
| |\
| | * Font Awesome fontconfig new icons (fixed errors)v1rgul2015-09-291-2/+2
| | * Font Awesome fontconfig new iconsv1rgul2015-09-291-25/+41
| |/
| * Minor comment addition for system load prompt segment.Ben Hilburn2015-09-281-0/+1
| * Cleaning up comments around font icon settings.Ben Hilburn2015-09-281-89/+87
| * Merge pull request #106 from V1rgul/masterBen Hilburn2015-09-282-0/+33
| |\
| | * Added awesome fontconfig supportv1rgul2015-09-272-0/+33
| * | Merge pull request #104 from dritter/vi_mode_cleanupBen Hilburn2015-09-282-11/+46
| |\ \
| | * | Better compatibility with shellcheck.net.Dominik Ritter2015-09-231-1/+6