Commit Graph

2559 Commits (7c73b22e75ac7cceffaec9bc88b6c20d5b5436b6)

Author SHA1 Message Date
Travis Swicegood 20b61a362f Merge remote-tracking branch 'origin/master' into fix/show-only-merges-into-master 2018-12-03 21:17:56 -06:00
Travis Swicegood babb1e6675 Adjust to only show merges into master
Adding `--first-parent` ensures that only commits from the master branch
are used when showing the history. I've verified this change directly
by comparing the `rev-list` output for `703105c..97df5c45`:

```console
$ git rev-list --merges 703105c...97df5c4
97df5c4540
b5976ada25
$ git rev-list --merges --first-parent 703105c...97df5c4
97df5c4540
```

Note: I've created this branch from 703105c so that I can merge `master`
into it and test `bash-it update` once merged.
2018-12-03 21:17:49 -06:00
Travis Swicegood 97df5c4540
Merge pull request #1143 from eedwards-sk/GH-1142
GH-1142 add behavior to address using set -e
2018-12-02 21:14:26 -06:00
Travis Swicegood b5976ada25 Merge remote-tracking branch 'origin/master' into GH-1142 2018-12-02 21:01:15 -06:00
Travis Swicegood 703105c562
Merge pull request #1230 from Bash-it/feature/add-crystal
Add Crystal auto-completion on Mac
2018-12-02 20:51:09 -06:00
Travis Swicegood 6706814dbc Adjust so this only runs when Homebrew is installed (thanks @nwinkler) 2018-12-02 20:44:00 -06:00
Travis Swicegood 544a0928f0
Merge pull request #1280 from Bash-it/feature/show-upgrades
Show upgrades before blindly upgrading
2018-12-02 12:55:22 -06:00
Travis Swicegood 185c2879d5 Update to show the subject if the body is empty 2018-12-02 10:53:56 -06:00
Travis Swicegood 8e7a566d96 Show update prompt when running bash-it update
This utilizes the body of the merged PR requests to show the commits
that are included in this update. It gives the user a chance to
decline the upgrades by pressing n or N.
2018-12-02 10:47:11 -06:00
Nils Winkler e3a89c8ef1
Merge pull request #1279 from icanhazstring/feature/composer-aliases
Add support for composer aliases
2018-11-30 08:22:53 +01:00
Andreas Frömer dbe4cc690f
Change default prefix to 'co'
Should resolve problem with accidental overriding global default commands like `cp`
2018-11-28 10:40:56 +01:00
icanhazstring bd0c1d92c5 Add support for composer aliases 2018-11-27 12:07:40 +01:00
Nils Winkler 2ce6d58365
Merge pull request #1274 from matthewadams/more-docker 2018-11-26 09:56:06 +01:00
Matthew Adams 6fcb32f851 rm d, dkalp & dkubu 2018-11-24 08:44:46 -06:00
Konstantin Gredeskoul 09c2be9d6b Refactor (extract utilities + add tests) & more…
* Extracting common utilities into utilities.bash
 * Adding new tests for utilities
 * Relocating the cache file to be under $BASH_IT
 * Removing cache cleanup deferral code for now
 * Wiping the cache in local_setup in tests.
2018-11-23 16:40:35 -08:00
Christophe Aguettaz 2f3d4bd130 [cleanup] Added missing global variable cleanup 2018-11-23 22:59:19 +01:00
Christophe Aguettaz 1ba023c97a [bugfix][wip] Fixed issue with Debian's bash-completion 2018-11-23 22:25:14 +01:00
Nils Winkler c84e3e5f85
Merge pull request #1275 from sptndc/patch-1
`init - bash` it's automatically load auto-completion
2018-11-23 09:51:50 +01:00
Septian Dwic 310ee837c9
init - bash its automatically load auto-completion 2018-11-21 02:05:19 +07:00
Matthew Adams 1f80b11476 more aliases 2018-11-20 09:29:15 -06:00
Matthew Adams 05529dbd6b more docker aliases 2018-11-20 07:59:16 -06:00
Konstantin Gredeskoul baae0305b6 Speed up bash-it Search & support exact matches
This commit improves Bash-It search functionality in a couple of ways:

 * bash-it search (with no arguments) will print detailed help.
 * bash-it search now accepts terms prefixed with '@' sign, indicating an exact match.
 * bash-it search now performs smarter caching of the component listings/status

New search syntax is as follows:

   bash-it search [-|@]term1 [-|@]term2 [ --enable | --disable | --help ]
2018-11-19 11:55:36 -08:00
Nils Winkler 8feebc0aa9
Merge pull request #1272 from tonyfeng9891220/master
fix the phoenix mix command -> 'phoenx' to 'phx'.
2018-11-16 08:36:10 +01:00
Nils Winkler 45449a845a
Merge pull request #1271 from seefood/knife-completion
Add completions for Opscode Chef's knife command
2018-11-16 08:35:29 +01:00
Tony Feng 96819ba7f3 fix the phoenix mix command -> 'phoenx' to 'phx'. 2018-11-15 16:57:08 +08:00
Ira Abramov 75564a050f Add completions for Opscode Chef's knife command 2018-11-15 10:35:17 +02:00
Nils Winkler 33139fecb4
Merge pull request #1270 from jeyglk/feature/powerline-kubectl-context
Add kubernetes-context segment to powerline
2018-11-14 08:52:50 +01:00
Jeremy Mathevet 7e26ae28bf
Add kubernetes-context segment to powerline 2018-11-13 12:29:53 +00:00
Nils Winkler a0c078ddde
Merge pull request #1269 from edubxb/fix-reload
Bash-it don't returns to the previous path after update
2018-11-13 08:55:33 +01:00
Eduardo Bellido Bellido 4df44b1fa9 Bash-it don't returns to the previous path after update 2018-11-12 22:59:14 +01:00
Nils Winkler a8ee759293
Merge pull request #1268 from edubxb/fzf-xdg
Support XDG in fzf plugin
2018-11-12 08:21:16 +01:00
Eduardo Bellido Bellido b3f7de3893 Support XDG in fzf plugin 2018-11-11 14:14:02 +01:00
cornfeedhobo 4ff305c009
add multiple path support to go plugin 2018-11-09 18:55:19 -05:00
Nils Winkler 164f287e70
Merge pull request #1262 from udondan/no-theme
disable theming by checking theme var for value
2018-11-02 11:03:29 +01:00
daniel.schroeder b03a93cd2b
disable theming by checking theme var for value 2018-11-02 10:47:55 +01:00
Nils Winkler e92c783174
Merge pull request #1260 from jalmansor/fix-docker-aliases
Fixing quotes around new docker aliases
2018-11-02 08:49:08 +01:00
Jason Al-Mansor 74b1fb8185 Fixing quotes around new docker aliases which cause them to execute 2018-11-01 10:45:08 -04:00
Nils Winkler fbefcb860b
Merge pull request #1258 from edubxb/aws-config-path-variables
Allow custom aws config files path
2018-11-01 09:16:43 +01:00
Nils Winkler b4edfffce9
Merge pull request #1259 from edubxb/powerline-themes-show-aws-profile
Add new segment, aws_profile, to powerline themes
2018-11-01 09:16:14 +01:00
Eduardo Bellido Bellido f757cad45a Add new segment, aws_profile, to powerline themes 2018-10-31 20:23:34 +01:00
Eduardo Bellido Bellido 3c8dbf3cd4 Allow custom aws config files path
Honor the environment variables:

  AWS_CONFIG_FILE
  AWS_SHARED_CREDENTIALS_FILE

in the aws plugin.

+info:
https://docs.aws.amazon.com/cli/latest/userguide/cli-environment.html
2018-10-31 19:18:37 +01:00
Nils Winkler 73af202a32
Merge pull request #1257 from LinkMJB/docker
Added more recently available docker cleanup commands
2018-10-31 16:13:48 +01:00
Nils Winkler c13a9f0c76
Merge pull request #1255 from LinkMJB/bolt
Added puppet bolt aliases
2018-10-31 16:12:05 +01:00
Nils Winkler 833ec7540b
Merge pull request #1256 from LinkMJB/puppet
Added puppet aliases
2018-10-31 16:11:14 +01:00
Nils Winkler d4f4e33ad5
Merge pull request #1254 from padilo/aws-session-token
aws session token support on awskeys
2018-10-31 16:09:54 +01:00
Nils Winkler db5bf50a24
Merge pull request #1252 from xzilla/patch-1
Make Postgres name use consistent
2018-10-31 16:09:08 +01:00
Matthew Bates f41324251f Added more recently available docker cleanup commands 2018-10-31 08:07:57 +00:00
Matthew Bates dd6d5ce687 Renamed to match convention 2018-10-31 07:55:40 +00:00
Matthew Bates c96cda1ff5 Added puppet aliases 2018-10-31 07:54:22 +00:00
Matthew Bates d41eac5db2 Added puppet bolt aliases 2018-10-31 07:42:45 +00:00