aboutsummaryrefslogtreecommitdiff
path: root/tmux.1
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2016-11-15 12:01:18 +0000
committerThomas Adam <thomas@xteddy.org>2016-11-15 12:01:18 +0000
commitfe7d9af3311bbaccb85fcb3aff2ec24462eac32e (patch)
tree5e4f660635ee63fc5d1c0eff70956db65cf56e52 /tmux.1
parent9908681ba8fbf775f784fa6cc9f298dfa1ede426 (diff)
parent9fe43d6acbc4468e3490f9a93df25b37c7dd18fa (diff)
downloadrtmux-fe7d9af3311bbaccb85fcb3aff2ec24462eac32e.tar.gz
rtmux-fe7d9af3311bbaccb85fcb3aff2ec24462eac32e.tar.bz2
rtmux-fe7d9af3311bbaccb85fcb3aff2ec24462eac32e.zip
Merge branch 'obsd-master'
Diffstat (limited to 'tmux.1')
-rw-r--r--tmux.11
1 files changed, 1 insertions, 0 deletions
diff --git a/tmux.1 b/tmux.1
index cbde59d4..be725dde 100644
--- a/tmux.1
+++ b/tmux.1
@@ -1036,6 +1036,7 @@ The following commands are supported in copy mode:
.It Li "copy-end-of-line" Ta "D" Ta "C-k"
.It Li "copy-line" Ta "" Ta ""
.It Li "copy-pipe <command>" Ta "" Ta ""
+.It Li "copy-pipe-and-cancel <command>" Ta "" Ta ""
.It Li "copy-selection" Ta "" Ta ""
.It Li "copy-selection-and-cancel" Ta "Enter" Ta "M-w"
.It Li "cursor-down" Ta "j" Ta "Down"