summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.1
diff options
context:
space:
mode:
authorTim van der Molen <tim@cvs.openbsd.org>2016-05-12 16:05:34 +0000
committerTim van der Molen <tim@cvs.openbsd.org>2016-05-12 16:05:34 +0000
commit1c66316a9ed260cf9014e2cbc38e5351fd23021f (patch)
tree7bfe2c950c05f0e4a11a96c2876e8b9d83b8627f /usr.bin/tmux/tmux.1
parent08c5a0c1f0536255a77e41a6413366acce1cfdd3 (diff)
- Rework load_cfg() error handling a little.
- Add -q to source-file to suppress errors about nonexistent files. Input and OK nicm@
Diffstat (limited to 'usr.bin/tmux/tmux.1')
-rw-r--r--usr.bin/tmux/tmux.114
1 files changed, 11 insertions, 3 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1
index 459c11efa82..3db090908a2 100644
--- a/usr.bin/tmux/tmux.1
+++ b/usr.bin/tmux/tmux.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: tmux.1,v 1.487 2016/05/01 11:46:12 nicm Exp $
+.\" $OpenBSD: tmux.1,v 1.488 2016/05/12 16:05:33 tim Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
.\"
@@ -14,7 +14,7 @@
.\" IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 1 2016 $
+.Dd $Mdocdate: May 12 2016 $
.Dt TMUX 1
.Os
.Sh NAME
@@ -913,10 +913,18 @@ display the log for
and
.Fl T
show debugging information about jobs and terminals.
-.It Ic source-file Ar path
+.It Xo Ic source-file
+.Op Fl q
+.Ar path
+.Xc
.D1 (alias: Ic source )
Execute commands from
.Ar path .
+If
+.Fl q
+is given, no error will be returned if
+.Ar path
+does not exist.
.It Ic start-server
.D1 (alias: Ic start )
Start the