aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2015-06-04 16:01:07 +0100
committerThomas Adam <thomas@xteddy.org>2015-06-04 16:01:07 +0100
commit83a70172a4a12ee9fa069b381172ddbf75c92ad1 (patch)
treee62163eec50cbb4c253e56ec677221034f87daee /tmux.1
parent02e348c069b9f49b44344281276b81fe537b3c8b (diff)
parent4a6c06d6a981d05c5ab3dbc7a365ff740fbb7feb (diff)
downloadrtmux-83a70172a4a12ee9fa069b381172ddbf75c92ad1.tar.gz
rtmux-83a70172a4a12ee9fa069b381172ddbf75c92ad1.tar.bz2
rtmux-83a70172a4a12ee9fa069b381172ddbf75c92ad1.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.112
1 files changed, 5 insertions, 7 deletions
diff --git a/tmux.1 b/tmux.1
index 11fe6b7e..125a13f2 100644
--- a/tmux.1
+++ b/tmux.1
@@ -2277,21 +2277,19 @@ command),
a server option with
.Fl s ,
otherwise a session option.
-.Pp
If
.Fl g
-is specified, the global session or window option is set.
+is given, the global session or window option is set.
The
.Fl u
flag unsets an option, so a session inherits the option from the global
-options.
-It is not possible to unset a global option.
+options (or with
+.Fl g ,
+restores a global option to the default).
.Pp
The
.Fl o
-flag prevents setting an option that is already set.
-.Pp
-The
+flag prevents setting an option that is already set and
.Fl q
flag suppresses errors about unknown options.
.Pp