aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | Split up `ram` segment into `ram` and `swap`.Dominik Ritter2016-01-234-47/+47
| |/
* | Merge pull request #202 from dritter/join_conditional_segmentsBen Hilburn2016-02-052-27/+91
|\ \ | |/ |/|
| * Joining conditional segments now work as expected. If between the lastDominik Ritter2016-01-232-44/+82
| * Use explicit word splitting. No need to set SH_WORD_SPLITDominik Ritter2016-01-231-4/+4
| * First try: Now joined segments are promoted to "full" segments, if theirDominik Ritter2016-01-231-4/+30
|/
* README: Arrghhhhh. Newlines in tables breaking things.Ben Hilburn2016-01-231-3/+1
* README: Documenting new background_jobs featureBen Hilburn2016-01-231-1/+9
* README: Updating language about ZSH frameworksBen Hilburn2016-01-231-3/+5
* Syntax fix.Dominik Ritter2016-01-221-1/+1
* Merge pull request #201 from Kayant/zsh-frameworksBen Hilburn2016-01-221-3/+2
|\
| * Fix spacing derpAnthony2016-01-221-1/+1
| * Add more ZSH framework instructionsKayant2016-01-201-2/+2
| * Improve zsh framework install description and add zplugKayant2016-01-171-3/+2
* | Merge pull request #200 from V1rgul/nextBen Hilburn2016-01-222-2/+15
|\ \ | |/ |/|
| * add background_jobs change in changelogv1rgul2016-01-221-0/+7
| * fix wc glitch on OSXv1rgul2016-01-221-1/+1
| * background_jobs: show number if verbosev1rgul2016-01-181-2/+8
| * Merge pull request #1 from bhilburn/nextV1rgul2016-01-187-1013/+1393
| |\ | |/ |/|
* | README: Added a tl;drBen Hilburn2016-01-171-3/+6
* | Merge pull request #197 from dritter/changelog_additionsBen Hilburn2016-01-171-0/+11
|\ \
| * | Changelog entries added for 'HOME_SUBFOLDER' state of the `dir` segment.Dominik Ritter2016-01-171-0/+11
|/ /
* | README: Minor cleanupsBen Hilburn2016-01-171-5/+4
* | README: Turns out you can't linebreak in tables.Ben Hilburn2016-01-171-15/+5
* | README: Trying out tables to describe variables.Ben Hilburn2016-01-171-91/+97
* | Merge pull request #196 from rjorgenson/nextBen Hilburn2016-01-171-2/+2
|\ \
| * | added space to end of RVM iconrjorgenson2016-01-171-2/+2
|/ /
* | Merge pull request #195 from dritter/minor_improvementsBen Hilburn2016-01-172-4/+4
|\ \
| * | Added "visual identifier" concept to `icons_test` segment.Dominik Ritter2016-01-171-1/+1
| * | Improved dir icon descriptions.Dominik Ritter2016-01-171-3/+3
|/ /
* | Merge pull request #193 from rjorgenson/nextBen Hilburn2016-01-161-1/+1
|\ \
| * | fixing segment call for new state implementation in prompt_loadrjorgenson2016-01-161-1/+1
|/ /
* | Merge pull request #191 from rjorgenson/nextBen Hilburn2016-01-161-1/+2
|\ \
| * | fixed conditional statementRobert Jorgenson2016-01-151-1/+1
| * | reworked nvm checkRobert Jorgenson2016-01-151-7/+6
| * | don't output segment if node_version was not populatedRobert Jorgenson2016-01-151-1/+1
| * | fixed called to ioreg on OS X machinesrjorgenson2016-01-141-1/+1
| * | added check for nvm command before runningrjorgenson2016-01-141-4/+6
* | | Merge pull request #192 from Kayant/nextBen Hilburn2016-01-163-2/+8
|\ \ \
| * | | Add sub folder icon when in home subdirectoriesKayant2016-01-163-2/+8
|/ / /
* | | Merge branch 'dritter-symlink_resolving_improvement' into nextBen Hilburn2016-01-151-1/+1
|\ \ \
| * | | Merge branch 'symlink_resolving_improvement' of https://github.com/dritter/po...Ben Hilburn2016-01-151-1/+1
|/| | |
| * | | Improved symlink dereferencing on OSX by calling a perl script.Dominik Ritter2016-01-091-1/+1
* | | | Merge branch 'thuandt-ruby-icon-patch' into nextBen Hilburn2016-01-150-0/+0
|\ \ \ \
| * | | | Merge branch 'ruby-icon-patch' of https://github.com/thuandt/powerlevel9k int...Ben Hilburn2016-01-150-0/+0
|/| | | |
| * | | | [FIX] RUBY_ICON should be $'\UF219'MrTuxHdb2016-01-121-1/+1
| |/ / /
* | / / [FIX] RUBY_ICON should be $'\UF219'MrTuxHdb2016-01-151-1/+1
| |/ / |/| |
* | | Merge pull request #180 from dritter/3_0_changelog_additionsBen Hilburn2016-01-121-1/+21
|\ \ \
| * | | Removed the "next"-tag.Dominik Ritter2016-01-081-1/+1
| * | | Added changelog entries.Dominik Ritter2016-01-081-0/+20
* | | | Comment cleanup.Dominik Ritter2016-01-081-1/+1