aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2019-06-20 09:02:26 +0100
committerThomas Adam <thomas@xteddy.org>2019-06-20 09:02:26 +0100
commit03945276f7010a69969714f8b581d68ee9ff92ba (patch)
treee09fa390d09df02ebc31e696bce5db733013ba12 /tmux.1
parentb3ca410bc398e9aa7a045cf1337ca3f08c005e6e (diff)
parentcd1fc42df6d1bacac4f617e031c279ba31bc0632 (diff)
downloadrtmux-03945276f7010a69969714f8b581d68ee9ff92ba.tar.gz
rtmux-03945276f7010a69969714f8b581d68ee9ff92ba.tar.bz2
rtmux-03945276f7010a69969714f8b581d68ee9ff92ba.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.15
1 files changed, 4 insertions, 1 deletions
diff --git a/tmux.1 b/tmux.1
index 9188ba47..6aa6d29f 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3685,7 +3685,7 @@ function key sequences; these have a number included to indicate modifiers such
as Shift, Alt or Ctrl.
.El
.It Xo Ic show-options
-.Op Fl gHqsvw
+.Op Fl AgHqsvw
.Op Fl t Ar target-session | Ar target-window
.Op Ar option
.Xc
@@ -3719,6 +3719,9 @@ is set, no error will be returned if
is unset.
.Fl H
includes hooks (omitted by default).
+.Fl A
+includes options inherited from a parent set of options, such options are
+marked with an asterisk.
.It Xo Ic show-window-options
.Op Fl gv
.Op Fl t Ar target-window