Fixing merge conflict

.gitignore

@@ -48,3 +48,7 @@ Vagrantfile
 .idea
 
 dist/*
+
+# Editor backups
+*~
+*.sw[a-z]

builtin/credential/cert/cli.go

@@ -39,7 +39,9 @@ func (h *CLIHandler) Help() string {
 The "cert" credential provider allows you to authenticate with a
 client certificate. No other authentication materials are needed.
 
-    Example: vault auth -method=cert 
+    Example: vault auth -method=cert \
+                        -client-cert=/path/to/cert.pem \
+                        -client-key=/path/to/key.pem
 
 	`
 

command/meta.go

@@ -315,23 +315,30 @@ func (m *Meta) loadCertFromPEM(path string) ([]*x509.Certificate, error) {
 func generalOptionsUsage() string {
 	general := `
   -address=addr           The address of the Vault server.
+                          Overrides the VAULT_ADDR environment variable if set.
 
   -ca-cert=path           Path to a PEM encoded CA cert file to use to
                           verify the Vault server SSL certificate.
+                          Overrides the VAULT_CACERT environment variable if set.
 
   -ca-path=path           Path to a directory of PEM encoded CA cert files
                           to verify the Vault server SSL certificate. If both
                           -ca-cert and -ca-path are specified, -ca-path is used.
+                          Overrides the VAULT_CAPATH environment variable if set.
 
   -client-cert=path       Path to a PEM encoded client certificate for TLS
                           authentication to the Vault server. Must also specify
-                          -client-key.
+                          -client-key.  Overrides the VAULT_CLIENT_CERT
+                          environment variable if set.
 
   -client-key=path        Path to an unencrypted PEM encoded private key
                           matching the client certificate from -client-cert.
+                          Overrides the VAULT_CLIENT_KEY environment variable
+                          if set.
 
   -tls-skip-verify        Do not verify TLS certificate. This is highly
-                          not recommended.
+                          not recommended.  Verification will also be skipped
+                          if VAULT_SKIP_VERIFY is set.
 	`
 	return strings.TrimSpace(general)
 }