aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorNicholas Marriott <nicholas.marriott@gmail.com>2013-02-23 22:42:49 +0000
committerNicholas Marriott <nicholas.marriott@gmail.com>2013-02-23 22:42:49 +0000
commit69a8d6471634ebdfa9db70b306e493f47ddd9a5d (patch)
tree1d566f02b2f432d01b8cce7b0587250dd1764c78 /tmux.1
parent3964309c67a683e5132662e38b5ff932af5cbeea (diff)
parent243244d285979e38401560383f6453457078e8de (diff)
downloadrtmux-69a8d6471634ebdfa9db70b306e493f47ddd9a5d.tar.gz
rtmux-69a8d6471634ebdfa9db70b306e493f47ddd9a5d.tar.bz2
rtmux-69a8d6471634ebdfa9db70b306e493f47ddd9a5d.zip
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Conflicts: cmd-if-shell.c cmd-run-shell.c tmux.1
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.19
1 files changed, 9 insertions, 0 deletions
diff --git a/tmux.1 b/tmux.1
index 9f0abc31..faa129a0 100644
--- a/tmux.1
+++ b/tmux.1
@@ -3470,6 +3470,7 @@ Miscellaneous commands are as follows:
Display a large clock.
.It Xo Ic if-shell
.Op Fl b
+.Op Fl t Ar target-pane
.Ar shell-command command
.Op Ar command
.Xc
@@ -3485,6 +3486,10 @@ With
.Fl b ,
.Ar shell-command
is run in the background.
+Before being executed, shell-command is expanded using the rules specified in the
+.Sx FORMATS
+section, including those relevant to
+.Ar target-pane .
.It Ic lock-server
.D1 (alias: Ic lock )
Lock each client individually by running the command specified by the
@@ -3502,6 +3507,10 @@ without creating a window.
With
.Fl b ,
the command is run in the background.
+Before being executed, shell-command is expanded using the rules specified in
+the
+.Sx FORMATS
+section.
After it finishes, any output to stdout is displayed in copy mode (in the pane
specified by
.Fl t