Commit Graph

3033 Commits

Author SHA1 Message Date
Markus Krause
feae99431a implement feedback 2020-06-19 19:45:59 +03:00
Markus Krause
83fdc89ec1 implement gitstatusd support 2020-06-19 19:45:58 +03:00
Nils Winkler
e0dba93561 Merge pull request #1620 from NoahGorny/new-git-aliases
New git rebase + git show aliases
2020-06-19 10:50:28 +02:00
Noah Gorny
7232506dab aliases/git: Add git show alias 2020-06-19 01:52:06 +03:00
Noah Gorny
937094f277 aliases/git: Add git rebase aliases 2020-06-19 01:45:59 +03:00
Nils Winkler
741c33d7e8 Merge pull request #1618 from finn-matti/patch-1
Add git difftool alias

Closes #1617
2020-06-17 10:33:30 +02:00
Nils Winkler
0186c656f1 Merge pull request #1619 from nwinkler/fix-svn-comparison
Fixed comparison for SVN info parameter
2020-06-17 10:30:02 +02:00
Nils Winkler
107cfe5daf Fixed comparison for SVN info parameter
Based on @arturmartins comment in #1615 - thanks!
2020-06-17 10:26:47 +02:00
finn-matti
a204f85f41 Add git difftool alias
See #1617
2020-06-17 11:11:52 +03:00
Nils Winkler
29858b8b93 Merge pull request #1615 from nwinkler/svn-xcode-unit-test
Added test case for base theme SVN functionality
2020-06-16 17:00:03 +02:00
Nils Winkler
3cffa35092 Fixed some more comments 2020-06-16 16:59:29 +02:00
Nils Winkler
c02638e946 Fixed comment 2020-06-16 16:58:29 +02:00
Nils Winkler
5aa525caae Refactored setup/teardown 2020-06-16 09:25:07 +02:00
Nils Winkler
f933a86ff0 Added tests for additional SVN scenarios 2020-06-16 09:24:24 +02:00
Nils Winkler
47f6682292 Added test case for base theme SVN functionality
Unit tests for #1612, #1613.
2020-06-15 17:09:44 +02:00
Nils Winkler
ecd58894f7 Merge pull request #1613 from nwinkler/svn-xcode-no-longer-provided
Add check for broken XCode SVN command
2020-06-15 08:44:33 +02:00
Nils Winkler
47512a1624 Checking for SVN return code 2020-06-14 19:31:25 +02:00
Nils Winkler
2ba3797da6 Added check for SVN not available 2020-06-09 14:07:17 +02:00
Nils Winkler
caced3b65f Using $() instead of backticks to make shellcheck happy 2020-06-09 14:07:17 +02:00
Nils Winkler
071abb295c Merge pull request #1610 from edumco/master
Update Travis configuration
2020-06-03 10:57:14 +02:00
José Eduardo Montenegro Cavalcanti de Oliveira
9e41386a04 Update .travis.yml 2020-06-01 14:40:42 -03:00
José Eduardo Montenegro Cavalcanti de Oliveira
4faba37fa1 Adds explicit version declarations 2020-06-01 14:26:31 -03:00
Nils Winkler
04ad8e982e Merge pull request #1608 from patricknraanes/fix_short-dirname
Fix _short-dirname
2020-05-23 18:09:26 +02:00
patricknraanes
2a05292cda Fix 2020-05-22 13:10:17 +02:00
Nils Winkler
cd5ebe8278 Merge pull request #1606 from cornfeedhobo/fix-fasd
use || to silence exit 1 properly and quote fasd init
2020-05-20 09:07:37 +02:00
cornfeedhobo
e7e9d04628 use || to silence exit 1 properly and quit fasd init 2020-05-19 16:59:47 -05:00
Nils Winkler
912d0b88d5 Merge pull request #1602 from cornfeedhobo/add-fasd-plugin
Add fasd plugin
2020-05-19 09:32:12 +02:00
Nils Winkler
20621e8452 Merge pull request #1603 from cornfeedhobo/docker-completion-fix
source distro provided docker completion
2020-05-19 09:26:20 +02:00
Nils Winkler
ed6d443a07 Merge pull request #1601 from dedowsdi/grep_color
Use default GREP_COLOR.
2020-05-19 09:12:35 +02:00
cornfeedhobo
3188f635e2 source distro provided docker completion 2020-05-18 15:01:57 -05:00
PntAndCnt
e05dd4c778 Use default GREP_COLOR. 2020-05-18 22:14:17 +08:00
Nils Winkler
1555f729ce Merge pull request #1599 from davidpfarrell/issue/1598-powerline-plain
Fixed quoting on POWERLINE_PROMPT_AFTER
2020-05-18 10:07:34 +02:00
Nils Winkler
b9bb5ebd70 Merge pull request #1594 from kfkonrad/robbyrussell
add robbyrussell theme

Closes #329
2020-05-18 09:56:04 +02:00
Nils Winkler
0e25d6bc71 Merge pull request #1588 from buhl/remove_empty_VIRTUAL_ENV
Removed initialization of empty VIRTUAL_ENV
2020-05-18 09:49:56 +02:00
David Farrell
981929cff0 Fixed quoting on POWERLINE_PROMPT_AFTER 2020-05-16 15:05:26 -07:00
buhl
3bfec8e682 Removed empty VIRTUAL_ENV declaration in the base theme 2020-05-13 22:01:20 +02:00
Al Johri
b3631ba13a add ohmyzsh, robbyrussell theme 2020-05-13 18:18:32 +02:00
Nils Winkler
f0dcf69857 Merge pull request #1593 from nwinkler/remove-vs-code-plugin
Removed VS Code Plugin, since VS Code provides the `code` command out of the box now
2020-05-13 10:26:56 +02:00
Nils Winkler
0122497e6c Removed VS Code Plugin, since VS Code provides the code command out of
the box now.
2020-05-13 10:25:36 +02:00
Nils Winkler
b9b3d42793 Merge pull request #1589 from rico-chet/test-without-rsync
test: Make `rsync` optional
2020-05-13 10:14:19 +02:00
Nils Winkler
efdd5d930e Merge pull request #1592 from edumco/update-build-badge
Update build badge link to travis-ci.com
2020-05-13 10:08:50 +02:00
José Eduardo Montenegro Cavalcanti de Oliveira
37aff10e58 Update build badge link to travis-ci.com 2020-05-12 05:34:45 -03:00
Alex Thiessen
9f3889c284 test: Make rsync optional
For bulk copying, `rsync` is used in test code, which is rather fast and
capable of saving needless write operations. The downside is that tests
fail when the tool is missing, which is the case with most minimal Linux
setups (e.g. containers or even Gnome installations of Debian).

Provide an alternative way for sufficiently fast copying by means of
`find -exec cp`. Measured total test time penalty is less than 0.5%.
Downside of needless write operations remains in case of fallback.
2020-05-11 02:30:10 +02:00
buhl
ad9876e6e3 Removed initialization of empty VIRTUAL_ENV
When spawning a new bash session when entering a virtual environment
the VIRTUAL_ENV is overwritten by this line.
However not having this line does not affect the bin/activate script.
2020-05-09 12:13:11 +02:00
Nils Winkler
d30483053f Merge pull request #1580 from matthewadams/powerline-plain-prompt-after
add powerline-plain config for prompt after chars
2020-05-08 09:13:37 +02:00
Matthew Adams
8f3872acb8 review2 2020-05-07 13:08:27 -05:00
Nils Winkler
ecf16550fe Merge pull request #1586 from nwinkler/fix-general-bash-it-description
Reworded the text for the general/bash-it alias loading
2020-05-07 08:59:30 +02:00
Nils Winkler
38bb8c087c Reworded the text for the general/bash-it alias loading
Also fixed a ShellCheck warning.

See #1560 for more details.
2020-05-07 08:57:37 +02:00
Nils Winkler
5ed42defc0 Merge pull request #1560 from Wabri/master
Separate bashit alias from general
2020-05-07 08:51:34 +02:00
Matthew Adams
dddb863657 change from feedback 2020-05-02 08:43:08 -05:00