aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tmux.18
-rw-r--r--tmux.c11
2 files changed, 13 insertions, 6 deletions
diff --git a/tmux.1 b/tmux.1
index e97d842d..07924b9e 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1,4 +1,4 @@
-.\" $Id: tmux.1,v 1.275 2010-12-10 21:05:22 nicm Exp $
+.\" $Id: tmux.1,v 1.276 2010-12-10 21:19:13 nicm Exp $
.\"
.\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
.\"
@@ -23,7 +23,7 @@
.Sh SYNOPSIS
.Nm tmux
.Bk -words
-.Op Fl 28lquv
+.Op Fl 28lquvV
.Op Fl c Ar shell-command
.Op Fl f Ar file
.Op Fl L Ar socket-name
@@ -198,6 +198,10 @@ and
files in the current directory, where
.Em PID
is the PID of the server or client process.
+.It Fl V
+Report the
+.Nm
+version.
.It Ar command Op Ar flags
This specifies one of a set of commands used to control
.Nm ,
diff --git a/tmux.c b/tmux.c
index bd3e08bf..1d83558c 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.225 2010-12-07 20:23:21 micahcowan Exp $ */
+/* $Id: tmux.c,v 1.226 2010-12-10 21:19:13 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -62,8 +62,8 @@ __dead void
usage(void)
{
fprintf(stderr,
- "usage: %s [-28lquv] [-c shell-command] [-f file] [-L socket-name]\n"
- " [-S socket-path] [command [flags]]\n",
+ "usage: %s [-28lquvV] [-c shell-command] [-f file] "
+ " [-L socket-name][-S socket-path] [command [flags]]\n",
__progname);
exit(1);
}
@@ -243,7 +243,7 @@ main(int argc, char **argv)
quiet = flags = 0;
label = path = NULL;
login_shell = (**argv == '-');
- while ((opt = getopt(argc, argv, "28c:df:lL:qS:uUv")) != -1) {
+ while ((opt = getopt(argc, argv, "28c:df:lL:qS:uUvV")) != -1) {
switch (opt) {
case '2':
flags |= IDENTIFY_256COLOURS;
@@ -258,6 +258,9 @@ main(int argc, char **argv)
xfree(shell_cmd);
shell_cmd = xstrdup(optarg);
break;
+ case 'V':
+ printf("%s %s\n", __progname, BUILD);
+ exit(0);
case 'f':
if (cfg_file != NULL)
xfree(cfg_file);