summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* fixed some comments and handled an edge caserjorgenson2017-01-041-2/+3
* fixed boolean valuesrjorgenson2017-01-041-5/+5
* reverted trailing space editrjorgenson2017-01-041-1/+1
* fixed colors to defaultsrjorgenson2017-01-041-1/+1
* added public IP segment for review/discussionrjorgenson2017-01-042-1/+49
* Merge pull request #369 from rjorgenson/context_host_depthBen Hilburn2017-01-042-2/+11
|\
| * added documentation for custom host depth to READMErjorgenson2016-12-311-0/+8
| * added custom host depth to context segmentrjorgenson2016-12-311-2/+3
|/
* Merge pull request #366 from rjorgenson/nextBen Hilburn2016-12-301-28/+21
|\
| * added a commentrjorgenson2016-12-201-0/+1
| * migrated battery segment to use pmset on OSX over ioregrjorgenson2016-12-201-28/+20
* | Merge pull request #360 from davidmpaz/icon_by_repoBen Hilburn2016-12-212-3/+23
|\ \
| * | Assign git service icon depending on repo originDavid Paz2016-12-151-1/+12
| * | Add service icon definition on Powerline-Patched FontsDavid Paz2016-12-151-1/+4
| * | Add service icon definition on fa-regularDavid Paz2016-12-151-1/+4
| * | Add service icon definition for fa-patchedDavid Paz2016-12-151-0/+3
* | | Merge branch 'master' into nextBen Hilburn2016-12-211-6/+8
|\ \ \
| * \ \ Merge pull request #348 from DeanF/masterBen Hilburn2016-12-211-6/+8
| |\ \ \ | | |/ / | |/| |
| | * | Supressed error message for invalid acpi date (happens when disconnecting the...Dean Fenster2016-12-081-1/+1
| | * | Fixed syntax issueDean Fenster2016-12-031-2/+3
| | * | Fixed an issue where full battery registers as disconnectedDean Fenster2016-12-031-5/+6
| |/ /
* | | Merge pull request #362 from shibumi/detect-virt-nextBen Hilburn2016-12-212-0/+21
|\ \ \ | |_|/ |/| |
| * | Merge branch 'detect-virt' into detect-virt-nextChristian Rebischke2016-12-202-7/+28
| |\ \
| | * | added virtualization detection with systemdChristian Rebischke2016-12-172-0/+21
| | |/
* | | Merge pull request #347 from thomaspaulmann/swiftBen Hilburn2016-12-063-7/+23
|\ \ \
| * | | Add prompt for current installed swift versionThomas Paul Mann2016-12-013-1/+16
| | |/ | |/|
| * | Merge pull request #343 from rouzbeh84/masterBen Hilburn2016-11-291-7/+7
| |\ \
| | * | helping with some spelling corrections in powerlevel9k.zsh-theme instructiona...Rouzbeh Sarrafieh2016-11-231-7/+7
| |/ /
* | | Merge pull request #346 from dritter/configurable_path_separatorsBen Hilburn2016-12-063-44/+67
|\ \ \ | | |/ | |/|
| * | Fix display of custom dir path separator on linuxDominik Ritter2016-12-041-2/+2
| * | Add syntax highlighting to examples in READMEDominik Ritter2016-11-301-39/+39
| * | Add documenatation for dir path separatorDominik Ritter2016-11-301-0/+6
| * | Add changelog entry for dir path separatorDominik Ritter2016-11-301-0/+8
| * | Make path separator configurable for dir promptDominik Ritter2016-11-301-0/+5
| * | Modify dir segment to use proper statesDominik Ritter2016-11-301-6/+10
|/ /
* | Merge pull request #341 from rjorgenson/nextBen Hilburn2016-11-291-1/+1
|\ \
| * \ Merge remote-tracking branch 'upstream/next' into nextrjorgenson2016-11-218-229/+534
| |\ \ | |/ / |/| |
* | | Merge branch 'master' into nextBen Hilburn2016-10-272-2/+4
|\ \ \ | | |/ | |/|
| * | Merge pull request #333 from eviltak/dir-truncate-right-with-delim-lenBen Hilburn2016-10-272-2/+4
| |\ \
| | * | Update test for required behaviorArav Singhal2016-10-271-1/+1
| | * | Consider delimiter length in dir truncate rightArav Singhal2016-10-271-1/+3
* | | | Merge pull request #332 from eviltak/show-ok-in-non-verbose-statusBen Hilburn2016-10-272-8/+7
|\ \ \ \
| * | | | Describe OK in non-verbose toggle in READMEArav Singhal2016-10-271-1/+2
| * | | | Add toggle for showing OK in non verbose statusArav Singhal2016-10-271-1/+2
| * | | | Make status prompt show OK in non-verbose modeArav Singhal2016-09-301-7/+4
| | |/ / | |/| |
* | | | Merge branch 'master' into nextBen Hilburn2016-10-261-4/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #321 from Jack-Q/masterBen Hilburn2016-10-261-4/+13
| |\ \ \
| | * | | fix load and ram indicator support for BSDJack Q2016-10-051-4/+13
| | |/ /
* | | | Merge branch 'master' into nextBen Hilburn2016-10-262-91/+91
|\| | |
| * | | Merge pull request #326 from mtraynham/fix_svn_detect_changesBen Hilburn2016-10-261-1/+1
| |\ \ \