summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorgy Frolov <gosha@fro.lv>2021-01-18 20:51:46 +0300
committerGitHub <noreply@github.com>2021-01-18 20:51:46 +0300
commit2b10c8f15b01acd4fb1802ac03141ff9644cbd0f (patch)
treef3c1de216438ddfa850d87273c33c17d80a709e2
parent29df547b5a90d9314680c53cf158ac9bc7583472 (diff)
parentb7beaae422f6c40ecf1bad2d9f33b34c38ad7432 (diff)
Merge branch 'master' into RW/unreached-exception
-rw-r--r--changelog.md5
-rw-r--r--mycli/AUTHORS1
-rwxr-xr-xmycli/main.py2
3 files changed, 7 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md
index c6e5688..c80c859 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,6 +5,11 @@ Bug Fixes:
----------
* Allow `FileNotFound` exception for SSH config files.
+Features:
+---------
+* Add `-g` shortcut to option `--login-path`.
+
+
1.23.2
===
diff --git a/mycli/AUTHORS b/mycli/AUTHORS
index e87a29c..c871f51 100644
--- a/mycli/AUTHORS
+++ b/mycli/AUTHORS
@@ -75,6 +75,7 @@ Contributors:
* Zach DeCook
* kevinhwang91
* KITAGAWA Yasutaka
+ * Nicolas Palumbo
* Andy Teijelo PĂ©rez
* bitkeen
* Morgan Mitchell
diff --git a/mycli/main.py b/mycli/main.py
index 6d98b0a..4069ebe 100755
--- a/mycli/main.py
+++ b/mycli/main.py
@@ -1083,7 +1083,7 @@ class MyCli(object):
help='Warn before running a destructive query.')
@click.option('--local-infile', type=bool,
help='Enable/disable LOAD DATA LOCAL INFILE.')
-@click.option('--login-path', type=str,
+@click.option('-g', '--login-path', type=str,
help='Read this path from the login file.')
@click.option('-e', '--execute', type=str,
help='Execute command and quit.')