aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* DETACHED_HEAD handlingNiccolò Maggioni2016-03-221-0/+2
* Git tag not replacing branchNiccolò Maggioni2016-03-221-1/+1
* Merge pull request #230 from sabricot/docker_machineBen Hilburn2016-03-223-1/+14
|\
| * Fix typo about docker in READMEsabricot2016-03-061-1/+1
| * Add a docker machine segmentsabricot2016-03-063-1/+14
* | Merge pull request #233 from wadkar/nvm_return_if_noneBen Hilburn2016-03-221-1/+1
|\ \ | |/ |/|
| * Combine two checks into oneSudarshan Wadkar2016-03-171-2/+1
| * Fix NVM prompt to return if not usedSudarshan Wadkar2016-03-151-0/+1
* | readme: more touchup to the segment listBen Hilburn2016-03-061-2/+4
* | readme: add horizontal barBen Hilburn2016-03-061-0/+2
* | readme: code-as-links transition in segment listBen Hilburn2016-03-061-30/+30
* | readme: testing code-as-link in MD codeBen Hilburn2016-03-061-2/+2
* | readme: re-organizing the segment listBen Hilburn2016-03-051-20/+35
* | Merge pull request #228 from wadkar/next_chruby_promptBen Hilburn2016-03-052-1/+13
|\|
| * Update README.md with `chruby` prompt infoSudarshan Wadkar2016-03-051-1/+2
| * [WIP] Rebase to origin:next branchSudarshan Wadkar2016-03-041-0/+11
|/
* Fixing #217, also making the `actionformats` color configurable in VCS segment.Ben Hilburn2016-03-041-3/+4
|\
| * Fixed actionformat color codingBen Hilburn2016-03-041-2/+1
| * trying to debug color code that won't deref in `vcs_states`Ben Hilburn2016-03-041-3/+5
|/
* Merge branch 'master' into next. Fixes Symfony typo in README.Ben Hilburn2016-03-031-3/+9
|\
| * Merge pull request #223 from B-Galati/patch-1Ben Hilburn2016-03-021-3/+3
| |\
| | * Fix typo about Symfony2 in READMEBenoit GALATI2016-03-021-3/+3
| |/
* | Merge pull request #221 from dritter/fix_vcs_testBen Hilburn2016-02-271-1/+5
|\ \
| * | Fix testDominik Ritter2016-02-261-1/+5
|/ /
* | Merge pull request #220 from dritter/rename_vcs_default_stateBen Hilburn2016-02-265-4/+92
|\ \
| * | Fix untracked state of the vcs segmentDominik Ritter2016-02-261-1/+1
| * | Add tests for dynamic color overriding of vcs segmentDominik Ritter2016-02-262-0/+78
| * | Rename VCS default state to `clean`Dominik Ritter2016-02-262-3/+13
* | | Merge pull request #219 from rmad17/nodeenv-supportBen Hilburn2016-02-262-0/+10
|\ \ \ | |/ / |/| |
| * | Updated READMErmad172016-02-261-0/+1
| * | Fixed name issuermad172016-02-261-3/+3
| * | Added nodeenv supportrmad172016-02-261-16/+8
| * | Nodeenv workrmad172016-02-261-0/+17
| |/
* | Merge pull request #214 from dritter/fix_vcs_foreground_colorBen Hilburn2016-02-262-20/+25
|\ \
| * | Clean up states in VCS segmentDominik Ritter2016-02-261-5/+13
| * | Fix dynamic coloring of VCS segmentDominik Ritter2016-02-182-15/+12
* | | Merge pull request #216 from natemccurdy/issues/215Ben Hilburn2016-02-212-2/+19
|\ \ \ | |/ / |/| |
| * | Improve the rbenv prompt by using `version-name`Nate McCurdy2016-02-202-2/+19
* | | Reflect submodule status in VCS prompty by default.Ben Hilburn2016-02-182-3/+9
* | | README: Adding Travis-CI status to READMEBen Hilburn2016-02-181-0/+1
* | | Merge pull request #212 from dritter/unit_testingBen Hilburn2016-02-1812-1/+492
|\ \ \ | |/ / |/| |
| * | Fix go testDominik Ritter2016-02-171-1/+1
| * | Add tests for `go_version`Dominik Ritter2016-02-152-0/+41
| * | Add tests for `rust_version`Dominik Ritter2016-02-152-0/+41
| * | Add documentation for Unit TestsDominik Ritter2016-02-131-0/+14
| * | Run tests on trusty, where ZSH 5.0.2 is availableDominik Ritter2016-02-131-1/+1
| * | Add tests for the dir segmentDominik Ritter2016-02-132-0/+119
| * | Avoid color warning on travisDominik Ritter2016-02-131-0/+1
| * | Add test for overwriting iconsDominik Ritter2016-02-131-0/+10
| * | Improve isolation of testsDominik Ritter2016-02-133-3/+4