From: Michael Prokop <mika@grml.org>
Date: Fri, 25 Mar 2022 15:02:13 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/github/pr/138'
X-Git-Tag: v0.19.3~1
X-Git-Url: https://git.grml.org/?a=commitdiff_plain;h=71bdc48d190a5369fff28a97c828db7b1edf10a9;hp=591479d07898f560c765505b16c720e4296d7e68;p=grml-etc-core.git

Merge remote-tracking branch 'origin/github/pr/138'
---

diff --git a/debian/changelog b/debian/changelog
index 42b1067..3d075c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc-core (0.19.2) grml-testing; urgency=medium
+
+  [ Frank Terbeck ]
+  * [4a3593b] doc: Error out properly when a generator fails
+
+ -- Michael Prokop <mika@grml.org>  Mon, 21 Mar 2022 16:22:05 +0100
+
 grml-etc-core (0.19.1) grml-testing; urgency=medium
 
   [ Bhoppi Chaw ]
diff --git a/etc/tmux.conf b/etc/tmux.conf
index 71be90b..ea20b33 100644
--- a/etc/tmux.conf
+++ b/etc/tmux.conf
@@ -30,7 +30,7 @@ bind-key J join-pane
 bind-key B if-shell "! tmux has-session -t bg" "new-session -d -s bg" \; move-window -t bg
 
 ### Reload Config
-bind-key R source-file ~/.tmux.conf \; display-message "~/.tmux.conf reloaded"
+bind-key R source-file ~/.tmux.conf \; source-file -q ~/.tmux.conf.local \; display-message "~/.tmux.conf[.local] reloaded"
 
 ###rebind keys
 bind-key h next-layout
@@ -66,3 +66,6 @@ set -g status-right '#[fg=yellow]%Y-%m-%d %H:%M'
 
 set-window-option -g window-status-style fg=blue,bg=black
 set-window-option -g window-status-current-style bold
+
+### source user-specific local configuration file
+source-file -q ~/.tmux.conf.local