Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | | | * | Merge pull request #685 from kenhys/disable-alias-grep | Ben Hilburn | 2017-12-05 | 1 | -4/+4 | |
| | | | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | vcs: Disable alias of grep to fix performance penalty | |||||
| | | | | | | | | | | * | Disable alias of grep | Kentaro Hayashi | 2017-11-27 | 1 | -4/+4 | |
| | | | | | | | | |_|/ | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user defined alias of grep command with '-r' or '--recursive' option, it causes a slow response of command line. It is not unexpected behavior of vcs info. This commit explicitly disables alias of grep to suppress side effects. | |||||
| | | | | | | | | | * | Updating build status to be `master` only. | Ben Hilburn | 2017-12-05 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | | | | | | | | | * | Merge pull request #680 from dinhnv/pyenv-patched | Ben Hilburn | 2017-12-05 | 1 | -11/+3 | |
| | | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | pyenv promt segment uses $PYENV_VERSION environment variable" | |||||
| | | | | | | | | | * | pyenv promt segment uses $PYENV_VERSION environment variable" | dinhnv | 2017-11-22 | 1 | -11/+3 | |
| | | | | | | | | |/ | | | | | | | | |/| | ||||||
| | | | | | | | | * | Merge pull request #676 from iScrE4m/patch-2 | Ben Hilburn | 2017-12-05 | 1 | -1/+12 | |
| | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | Kubernetes segment shorter if possible | |||||
| | | | | | | | | * | added forgotten $ | David Jetelina | 2017-11-14 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | | | | | | | | * | Kubernetes segment shorter if possible | David Jetelina | 2017-11-14 | 1 | -1/+12 | |
| | | | | | | | |/ | | | | | | | | | | | | | | | | | | | Fixes #675 | |||||
| | | | | | | | * | Merge pull request #667 from akranga/master | Ben Hilburn | 2017-11-10 | 1 | -1/+1 | |
| | | | | | | |/| | | | | | | | | | | | | | | | | | | | Add support for both AWS_PROFILE and AWS_DEFAULT_PROFILE | |||||
| | | | | | | | * | Add support for both AWS_PROFILE and AWS_DEFAULT_PROFILE | Antons Kranga | 2017-11-07 | 1 | -1/+1 | |
| | | | | | | |/ | ||||||
| | | | | | | * | Merge pull request #660 from brianmoran/ISS-650-pythonpath-in-prompt | Ben Hilburn | 2017-11-02 | 1 | -1/+1 | |
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | ISS-650 Fix PYTHONPATH appearing in prompt | |||||
| | | | | | | | * | ISS-650 Fix PYTHONPATH appearing in prompt | Brian Moran | 2017-10-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modify prompt_dir function to set current_path based on pwd and replace $HOME with ~ | |||||
| | | | | | | * | | Merge pull request #663 from MarcHauptmann/master | Ben Hilburn | 2017-11-02 | 1 | -1/+2 | |
| | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | declared variables as 'local' | |||||
| | | | | | | | * | | declared variables as 'local' | Marc Hauptmann | 2017-10-31 | 1 | -1/+2 | |
| | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents warning messages from zsh | |||||
| | | | | | | * | | Merge pull request #656 from ylluminarious/remove-weird-glyphs | Ben Hilburn | 2017-10-27 | 1 | -2/+2 | |
| | | | | | |/| | | | | | | | | | | | | | | | | | | | | remove weird glyphs in README.md | |||||
| | | | | | | * | | remove weird glyphs in README.md | George D. Plymale II | 2017-10-24 | 1 | -2/+2 | |
| | | | | | |/ / | ||||||
| | | | | | * | | Merge pull request #651 from claycephas/more-documentation | Ben Hilburn | 2017-10-18 | 2 | -0/+4 | |
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | Add documentation for VCS hooks config | |||||
| | | | | | | * | | Add documentation for VCS hooks config | Clay Anderson | 2017-10-17 | 1 | -0/+3 | |
| | | | | | | | | | ||||||
| | | | | | | * | | Add *.swp to ignore | Clay Anderson | 2017-10-17 | 1 | -0/+1 | |
| | | | | | |/ / | | | | | |/| | | ||||||
| | | | | | * | | Merge pull request #647 from sbutler2901/master | Ben Hilburn | 2017-10-18 | 1 | -1/+5 | |
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | OSX bug fix for prompt_public_ip | |||||
| | | | | | | * | | Bug fix for prompt_public_ip. The OSX date command does not have the -r ↵ | sbutler2901 | 2017-10-12 | 1 | -1/+5 | |
| | | | | | |/ / | | | | | |/| | | | | | | | | | | | | | | | | | | option for getting the last modification time of a file. The stat command is being used instead | |||||
| | | | | | * | | Merge pull request #643 from terencode/patch-1 | Ben Hilburn | 2017-10-18 | 1 | -1/+1 | |
| | | | | |/| | | | | | | | | | | | | | | | | | | Fix incomplete vpn segment name | |||||
| | | | | | * | | Fix incomplete vpn segment name | Térence Clastres | 2017-10-07 | 1 | -1/+1 | |
| | | | | |/ / | | | | | | | | | | | | | | | The segment function is called *prompt_vpn_ip()* thus the segment needs to be called "vpn_ip". | |||||
| | | | | * / | Fixing `vcs.spec` tests after adding space. | Ben Hilburn | 2017-10-07 | 1 | -3/+3 | |
| | | | |/ / | ||||||
| | | | * | | Adding a space after VCS_BRANCH_ICON by default | Ben Hilburn | 2017-10-07 | 1 | -3/+3 | |
| | | | | | | ||||||
| | | | * | | Merge pull request #640 from simonvpe/master | Ben Hilburn | 2017-10-07 | 1 | -1/+1 | |
| | | | |\ \ | | | | | | | | | | | | | | | Corrected awesome-fontconfig lock icon | |||||
| | | | | * | | Corrected awesome-fontconfig lock icon | Simon Pettersson | 2017-10-05 | 1 | -1/+1 | |
| | | | |/ / | | | |/| | | ||||||
| | | | * | | Merge pull request #636 from ZeGentzy/master | Ben Hilburn | 2017-10-07 | 1 | -4/+4 | |
| | | |/| | | | | | | | | | | | | | | Fixes issue #619 | |||||
| | | | * | | These probably have similar bugs | Hal Gentz | 2017-09-29 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Hal Gentz <zegentzy@protonmail.com> | |||||
| | | | * | | Fixes issue #619 | Hal Gentz | 2017-09-29 | 1 | -1/+1 | |
| | | |/ / | | | | | | | | | | | | | | | | Signed-off-by: Hal Gentz <zegentzy@protonmail.com> | |||||
| | | * | | Merge pull request #616 from trashbat/patch-2 | Ben Hilburn | 2017-09-29 | 1 | -1/+1 | |
| | | |\ \ | | | | | | | | | | | | | Changed "less than" to "fewer than". | |||||
| | | | * | | Changed "less than" to "fewer than". | trashbat | 2017-09-05 | 1 | -1/+1 | |
| | | | | | | ||||||
| | | * | | | Merge pull request #611 from Typositoire/fix/prompt_kubecontextlocal1 | Ben Hilburn | 2017-09-29 | 1 | -1/+1 | |
| | | |\ \ \ | | | | |/ / | | | |/| | | Fix prompt_kubecontext:local:1: not valid in this context: Version: | |||||
| | | | * | | Fix prompt_kubecontext:local:1: not valid in this context: Version: | Yann David | 2017-08-31 | 1 | -1/+1 | |
| | | |/ / | ||||||
| | | * | | Merge pull request #608 from tippl/fix_load_segment | Ben Hilburn | 2017-08-28 | 1 | -21/+28 | |
| | | |\ \ | | | | | | | | | | | | | Fix average selection in load segment. | |||||
| | | | * | | Fix average selection in load segment. | Richard Tippl | 2017-08-27 | 1 | -21/+28 | |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed duplicate code selecting which load average to use. Fixed load average selection being in OSX/BSD part of if, making it not work on non OSX/BSD systems. Optimized actually getting the load average. | |||||
| | | * / | README: Quick typo fix. | Ben Hilburn | 2017-08-27 | 1 | -1/+1 | |
| | | |/ | ||||||
| | | * | README: Quick fix to MD formatting | Ben Hilburn | 2017-08-26 | 1 | -1/+1 | |
| |_|/ |/| | | ||||||
* | | | Updating CHANGELOG for v0.6.4 | Ben Hilburn | 2017-08-26 | 1 | -6/+14 | |
| | | | ||||||
* | | | Merge branch 'master' into next | Ben Hilburn | 2017-08-26 | 1 | -1/+1 | |
|\ \ \ | ||||||
| * \ \ | Merge pull request #602 from varundey/patch-1 | Ben Hilburn | 2017-08-26 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | README: Updated braces for hyperlink | |||||
| | * | | | Updated braces for hyperlink | Varun Dey | 2017-08-14 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #605 from tadeoos/next | Ben Hilburn | 2017-08-26 | 2 | -7/+29 | |
|\ \ \ \ | |_|_|/ |/| | | | Add average choice to load extension | |||||
| * | | | Add average choice to load extension | Tadek Teleżyński | 2017-08-17 | 2 | -7/+29 | |
|/ / / | | | | | | | | | | | | | | | | | | | This commit adds a functionality to choose if one wants to see 1, 5 or 15 minutes average. Resolves issue #604 | |||||
* | | | Merge pull request #596 from eumiro/truncate_to_unique | Ben Hilburn | 2017-08-12 | 3 | -0/+43 | |
|\ \ \ | | | | | | | | | Add TRUNCATE_TO_UNIQUE shortening dir strategy | |||||
| * | | | Adding reference for `truncate_to_unique` code. | Ben Hilburn | 2017-08-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | README: Slight change to new truncation strategy doc | Ben Hilburn | 2017-08-12 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | add TRUNCATE_TO_UNIQUE shortening dir strategy | Miroslav Šedivý | 2017-08-11 | 3 | -0/+43 | |
| | |/ | |/| | | | | | | | This creates the shortest unique path elements that can be unambiguously expanded to the original path. | |||||
* | | | Merge branch 'master' into next | Ben Hilburn | 2017-08-12 | 4 | -12/+32 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Merge pull request #594 from belak/fix-prompt-sp | Ben Hilburn | 2017-08-12 | 1 | -2/+2 | |
| |\ \ | | |/ | |/| | Add back the `prompt_sp` option for zsh >= 5.4.1 |