aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve the rbenv prompt by using `version-name`Nate McCurdy2016-02-202-2/+19
| | | | | | | | | | | | | | | | | | | | | Prior to this, the rbenv prompt only showed something if the $RBENV_VERSION environment variable was set. This was not a complete solution because rbenv can be configured locally, per directory, with dotfiles. When using dotfiles, the $RBENV_VERSION variables is not set. This fixes the issue by taking the output of the `rbenv version-name` command which shows the real rbenv version being used based on any of the 4 ways to change rbenv as shown here: https://github.com/rbenv/rbenv#choosing-the-ruby-version If the current version of Ruby being used is the same as the global Ruby, nothing is shown. This commit also adds documentation to the README that describes the prompt. Fixes issue #215
* Merge pull request #211 from Falkor/feature/better_dirty_checkBen Hilburn2016-02-091-1/+5
|\ | | | | VCS dirty check even in subdirs
| * mention to git_compare_versionSebastien Varrette2016-02-091-1/+1
| | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
| * correct half-dirty detection -- restrict to untracked filesSebastien Varrette2016-02-091-1/+1
| | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
| * dirty check even in subdirsSebastien Varrette2016-02-081-1/+5
|/ | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu>
* Merge pull request #208 from dritter/fix_joiningBen Hilburn2016-02-061-2/+2
|\ | | | | Fix joining segments from #186
| * Fix joining segmentsDominik Ritter2016-02-061-2/+2
|/
* Pull PR #204 into `next`. Introduces new VCS state, `untracked`Ben Hilburn2016-02-053-5/+33
|\
| * Merging @theminor's changes from PR #204Ben Hilburn2016-02-053-5/+33
|/|
| * update CHANGELOG re new UNTRACKED state in vcs segmentJohn Minor2016-01-311-0/+19
| |
| * Add "_UNTRACKED" option for _VCS to change colors - default yellowJohn Minor2016-01-281-2/+8
| |
| * Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged filestheminor2016-01-271-1/+3
| |
* | Merge branch 'master' into nextBen Hilburn2016-02-054-0/+19
|\ \
| * \ Merge pull request #207 from gitter-badger/gitter-badgeBen Hilburn2016-02-051-0/+2
| |\ \ | | | | | | | | Add a Gitter chat badge to README.md
| | * | Add Gitter badgeThe Gitter Badger2016-02-051-0/+2
| |/ /
| * | Merge pull request #203 from dritter/beanstalkBen Hilburn2016-02-054-0/+19
| |\ \ | | |/ | |/| Reworked the AWS-Beanstalk segment
| | * Added changelog entry.Dominik Ritter2016-01-231-0/+6
| | |
| | * Reworked the AWS Elastic Beanstalk segment.Dominik Ritter2016-01-231-3/+4
| | |
| | * More space for the Beanstalk-Icon.Dominik Ritter2016-01-231-3/+3
| | |
| | * Added documentation for the AWS Beanstalk segment.Dominik Ritter2016-01-231-0/+1
| | |
| | * Adding command prompt for AWS Elastic Beanstalk environment name.James Bowman2016-01-232-0/+11
| |/
* | Merge pull request #205 from dritter/dir_delimiterBen Hilburn2016-02-051-1/+1
|\ \ | | | | | | Change default dir truncation delimitor to ellipsis
| * | Change default dir truncation delimitor to ellipsisDominik Ritter2016-02-041-1/+1
| |/
* | Merge pull request #198 from dritter/vcs_customizableBen Hilburn2016-02-051-2/+4
|\ \ | | | | | | VCS-hooks customizable
| * | Made the VCS-hooks customizable.Dominik Ritter2016-01-231-2/+4
| |/
* | Merge pull request #181 from dritter/split_up_ram_segmentBen Hilburn2016-02-054-47/+47
|\ \ | | | | | | Split up `ram` segment into `ram` and `swap`.
| * | 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
|\ \ | |/ |/| Allows the use of `_join` on conditional segments.
| * Joining conditional segments now work as expected. If between the lastDominik Ritter2016-01-232-44/+82
| | | | | | | | | | | | printed segment is a full but conditional segment, the joined one gets promoted. This fixes #186
| * 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
|/ | | | predecessor was conditional and had no output.
* 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
|\ | | | | Add more ZSH framework instructions
| * Fix spacing derpAnthony2016-01-221-1/+1
| |
| * Add more ZSH framework instructionsKayant2016-01-201-2/+2
| | | | | | | | | | | | | | *Zgen *Antibody *ZPM *ZIM
| * Improve zsh framework install description and add zplugKayant2016-01-171-3/+2
| |
* | Merge pull request #200 from V1rgul/nextBen Hilburn2016-01-222-2/+15
|\ \ | |/ |/| background_jobs segment : add number of jobs if >1
| * 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
| |\ | |/ |/| Merge original repo
* | 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.
| * | 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
| |