Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Improve the rbenv prompt by using `version-name` | Nate McCurdy | 2016-02-20 | 2 | -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_check | Ben Hilburn | 2016-02-09 | 1 | -1/+5 |
|\ | | | | | VCS dirty check even in subdirs | ||||
| * | mention to git_compare_version | Sebastien Varrette | 2016-02-09 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu> | ||||
| * | correct half-dirty detection -- restrict to untracked files | Sebastien Varrette | 2016-02-09 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu> | ||||
| * | dirty check even in subdirs | Sebastien Varrette | 2016-02-08 | 1 | -1/+5 |
|/ | | | | Signed-off-by: Sebastien Varrette <Sebastien.Varrette@uni.lu> | ||||
* | Merge pull request #208 from dritter/fix_joining | Ben Hilburn | 2016-02-06 | 1 | -2/+2 |
|\ | | | | | Fix joining segments from #186 | ||||
| * | Fix joining segments | Dominik Ritter | 2016-02-06 | 1 | -2/+2 |
|/ | |||||
* | Pull PR #204 into `next`. Introduces new VCS state, `untracked` | Ben Hilburn | 2016-02-05 | 3 | -5/+33 |
|\ | |||||
| * | Merging @theminor's changes from PR #204 | Ben Hilburn | 2016-02-05 | 3 | -5/+33 |
|/| | |||||
| * | update CHANGELOG re new UNTRACKED state in vcs segment | John Minor | 2016-01-31 | 1 | -0/+19 |
| | | |||||
| * | Add "_UNTRACKED" option for _VCS to change colors - default yellow | John Minor | 2016-01-28 | 1 | -2/+8 |
| | | |||||
| * | Add VCS_WORKDIR_HALF_DIRTY vrbl for unstaged files | theminor | 2016-01-27 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'master' into next | Ben Hilburn | 2016-02-05 | 4 | -0/+19 |
|\ \ | |||||
| * \ | Merge pull request #207 from gitter-badger/gitter-badge | Ben Hilburn | 2016-02-05 | 1 | -0/+2 |
| |\ \ | | | | | | | | | Add a Gitter chat badge to README.md | ||||
| | * | | Add Gitter badge | The Gitter Badger | 2016-02-05 | 1 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #203 from dritter/beanstalk | Ben Hilburn | 2016-02-05 | 4 | -0/+19 |
| |\ \ | | |/ | |/| | Reworked the AWS-Beanstalk segment | ||||
| | * | Added changelog entry. | Dominik Ritter | 2016-01-23 | 1 | -0/+6 |
| | | | |||||
| | * | Reworked the AWS Elastic Beanstalk segment. | Dominik Ritter | 2016-01-23 | 1 | -3/+4 |
| | | | |||||
| | * | More space for the Beanstalk-Icon. | Dominik Ritter | 2016-01-23 | 1 | -3/+3 |
| | | | |||||
| | * | Added documentation for the AWS Beanstalk segment. | Dominik Ritter | 2016-01-23 | 1 | -0/+1 |
| | | | |||||
| | * | Adding command prompt for AWS Elastic Beanstalk environment name. | James Bowman | 2016-01-23 | 2 | -0/+11 |
| |/ | |||||
* | | Merge pull request #205 from dritter/dir_delimiter | Ben Hilburn | 2016-02-05 | 1 | -1/+1 |
|\ \ | | | | | | | Change default dir truncation delimitor to ellipsis | ||||
| * | | Change default dir truncation delimitor to ellipsis | Dominik Ritter | 2016-02-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #198 from dritter/vcs_customizable | Ben Hilburn | 2016-02-05 | 1 | -2/+4 |
|\ \ | | | | | | | VCS-hooks customizable | ||||
| * | | Made the VCS-hooks customizable. | Dominik Ritter | 2016-01-23 | 1 | -2/+4 |
| |/ | |||||
* | | Merge pull request #181 from dritter/split_up_ram_segment | Ben Hilburn | 2016-02-05 | 4 | -47/+47 |
|\ \ | | | | | | | Split up `ram` segment into `ram` and `swap`. | ||||
| * | | Split up `ram` segment into `ram` and `swap`. | Dominik Ritter | 2016-01-23 | 4 | -47/+47 |
| |/ | |||||
* | | Merge pull request #202 from dritter/join_conditional_segments | Ben Hilburn | 2016-02-05 | 2 | -27/+91 |
|\ \ | |/ |/| | Allows the use of `_join` on conditional segments. | ||||
| * | Joining conditional segments now work as expected. If between the last | Dominik Ritter | 2016-01-23 | 2 | -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_SPLIT | Dominik Ritter | 2016-01-23 | 1 | -4/+4 |
| | | |||||
| * | First try: Now joined segments are promoted to "full" segments, if their | Dominik Ritter | 2016-01-23 | 1 | -4/+30 |
|/ | | | | predecessor was conditional and had no output. | ||||
* | README: Arrghhhhh. Newlines in tables breaking things. | Ben Hilburn | 2016-01-23 | 1 | -3/+1 |
| | |||||
* | README: Documenting new background_jobs feature | Ben Hilburn | 2016-01-23 | 1 | -1/+9 |
| | |||||
* | README: Updating language about ZSH frameworks | Ben Hilburn | 2016-01-23 | 1 | -3/+5 |
| | |||||
* | Syntax fix. | Dominik Ritter | 2016-01-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #201 from Kayant/zsh-frameworks | Ben Hilburn | 2016-01-22 | 1 | -3/+2 |
|\ | | | | | Add more ZSH framework instructions | ||||
| * | Fix spacing derp | Anthony | 2016-01-22 | 1 | -1/+1 |
| | | |||||
| * | Add more ZSH framework instructions | Kayant | 2016-01-20 | 1 | -2/+2 |
| | | | | | | | | | | | | | | *Zgen *Antibody *ZPM *ZIM | ||||
| * | Improve zsh framework install description and add zplug | Kayant | 2016-01-17 | 1 | -3/+2 |
| | | |||||
* | | Merge pull request #200 from V1rgul/next | Ben Hilburn | 2016-01-22 | 2 | -2/+15 |
|\ \ | |/ |/| | background_jobs segment : add number of jobs if >1 | ||||
| * | add background_jobs change in changelog | v1rgul | 2016-01-22 | 1 | -0/+7 |
| | | |||||
| * | fix wc glitch on OSX | v1rgul | 2016-01-22 | 1 | -1/+1 |
| | | |||||
| * | background_jobs: show number if verbose | v1rgul | 2016-01-18 | 1 | -2/+8 |
| | | |||||
| * | Merge pull request #1 from bhilburn/next | V1rgul | 2016-01-18 | 7 | -1013/+1393 |
| |\ | |/ |/| | Merge original repo | ||||
* | | README: Added a tl;dr | Ben Hilburn | 2016-01-17 | 1 | -3/+6 |
| | | |||||
* | | Merge pull request #197 from dritter/changelog_additions | Ben Hilburn | 2016-01-17 | 1 | -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 Ritter | 2016-01-17 | 1 | -0/+11 |
|/ / | |||||
* | | README: Minor cleanups | Ben Hilburn | 2016-01-17 | 1 | -5/+4 |
| | | |||||
* | | README: Turns out you can't linebreak in tables. | Ben Hilburn | 2016-01-17 | 1 | -15/+5 |
| | | |||||
* | | README: Trying out tables to describe variables. | Ben Hilburn | 2016-01-17 | 1 | -91/+97 |
| | |