X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Ftmux.conf;h=43e280f15cca1600966f7c3ef6201e3624dc22fa;hb=c0280d16a9f44830885b456241e41ff308ecfec8;hp=223ad893fc4cd949c816bd876f0714f0eef3b56b;hpb=ee6fa75b9f8ccec352dedb1c14ea9484cccb318d;p=grml-etc-core.git

diff --git a/etc/tmux.conf b/etc/tmux.conf
index 223ad89..43e280f 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -7,7 +7,7 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
-# screen-like keybindings
+### screen-like keybindings
 unbind C-b
 set -g prefix C-a
 bind-key a send-prefix
@@ -15,20 +15,23 @@ bind-key C-a last-window
 unbind space
 bind-key space next-window
 bind-key C-space next-window
-bind-key K confirm-before kill-window
+bind-key K confirm-before kill-pane
 bind-key \ confirm-before kill-session
 #bind-key C-h previous-window
 
-#rebind keys
+### join the last active pane to the currently active window
+bind-key j join-pane -s !
+
+###rebind keys
 bind-key h next-layout
 bind-key ^? previous-window
 bind-key ^H previous-window
 bind-key tab select-pane -t :.+
-# useful custom keybindings
+### useful custom keybindings
 bind-key | command-prompt -p "exec:" "split-window -h '%%'"
 bind-key - command-prompt -p "exec:" "split-window -v '%%'"
 
-# misc options
+### misc options
 set -s escape-time 0
 set -g default-terminal "screen-256color"
 set -g display-panes-time 3000
@@ -36,7 +39,7 @@ set -g mouse-select-pane off
 set -g visual-activity on
 set -g mode-keys vi
 
-#set status line appearance
+### set status line appearance
 set -g status-utf8 on
 set -g status-fg white
 set -g status-bg black