summaryrefslogtreecommitdiff
path: root/docs/source/markdown/podman-run.1.md.in
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-08-24 09:14:42 -0400
committerGitHub <noreply@github.com>2022-08-24 09:14:42 -0400
commit67c4068bb35fd1aad95b1701c94ed11183d0fd66 (patch)
tree19f9cc0bbbdd593cbb099c260bf6e395cd80d715 /docs/source/markdown/podman-run.1.md.in
parent1bcceadca4850e8efd975d927a5586ad052207ac (diff)
parentb4584ea8546be227c74174130ec3a04a93996d28 (diff)
downloadpodman-67c4068bb35fd1aad95b1701c94ed11183d0fd66.tar.gz
podman-67c4068bb35fd1aad95b1701c94ed11183d0fd66.tar.bz2
podman-67c4068bb35fd1aad95b1701c94ed11183d0fd66.zip
Merge pull request #15443 from flouthoc/env-merge-support
run,create: add support for `--env-merge` for preprocessing default environment variables
Diffstat (limited to 'docs/source/markdown/podman-run.1.md.in')
-rw-r--r--docs/source/markdown/podman-run.1.md.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/source/markdown/podman-run.1.md.in b/docs/source/markdown/podman-run.1.md.in
index 8457a7fa6..16b5ffcab 100644
--- a/docs/source/markdown/podman-run.1.md.in
+++ b/docs/source/markdown/podman-run.1.md.in
@@ -243,6 +243,8 @@ Read in a line delimited file of environment variables. See **Environment** note
@@option env-host
+@@option env-merge
+
@@option expose
@@option gidmap.container