summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/git/config1
-rw-r--r--.config/weechat/alias.conf2
2 files changed, 3 insertions, 0 deletions
diff --git a/.config/git/config b/.config/git/config
index 0394315..2d66d36 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -31,6 +31,7 @@
annotated = true
[merge]
conflictstyle = diff3
+ tool = vimdiff
[am]
threeWay = true
[log]
diff --git a/.config/weechat/alias.conf b/.config/weechat/alias.conf
index ef6043d..fd84680 100644
--- a/.config/weechat/alias.conf
+++ b/.config/weechat/alias.conf
@@ -21,6 +21,7 @@ c = "/window scroll_beyond_end"
chat = "dcc chat"
cl = "buffer clear"
close = "buffer close"
+code = "/exec -o -sh ircize"
exit = "quit"
hax = "/quote -server hax RAW :$*"
ig = "ignore"
@@ -35,6 +36,7 @@ n = "names"
q = "query"
redraw = "window refresh"
say = "msg *"
+sh = "/exec -o -sh"
signoff = "quit"
t = "topic"
ub = "unban"