Set rebase to false on pull from git

[rbdr/dotfiles] / weechat / xfer.conf

diff --git a/weechat/xfer.conf b/weechat/xfer.conf
index dffa8e7321b0260ec85e096a0b050b4badaa4f8f..fd8b814e8ebe38ee82aa8fe12ff6a047165c18c9 100644 (file)
--- a/weechat/xfer.conf
+++ b/weechat/xfer.conf
@@ -1,10 +1,18 @@
 #
-# xfer.conf -- weechat v0.3.8
+# weechat -- xfer.conf
+#
+# WARNING: It is NOT recommended to edit this file by hand,
+# especially if WeeChat is running.
+#
+# Use /set or similar command to change settings in WeeChat.
+#
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
 auto_open_buffer = on
 progress_bar_size = 20
+pv_tags = "notify_private"
 
 [color]
 status_aborted = lightred
@@ -22,12 +30,15 @@ blocksize = 65536
 fast_send = on
 own_ip = ""
 port_range = ""
+send_ack = on
 speed_limit = 0
 timeout = 300
 
 [file]
 auto_accept_chats = off
 auto_accept_files = off
+auto_accept_nicks = ""
+auto_check_crc32 = off
 auto_rename = on
 auto_resume = on
 convert_spaces = on