From 0ae0439864e802b402d8d89fc16a566418adae11 Mon Sep 17 00:00:00 2001
From: Kyle Meyer <kyle@kyleam.com>
Date: Tue, 16 Sep 2014 22:32:35 -0400
Subject: Unbind magit-add-change-log-entry-other-window

---
 lisp/init-git.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lisp/init-git.el b/lisp/init-git.el
index 7402042..0ae7034 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -88,6 +88,9 @@ START-POINT set to the current branch.
   (define-key magit-popup-mode-map (kbd "SPC SPC <t>") 'magit-invoke-popup-option)
 
   (define-key magit-mode-map (kbd "C-c m") 'km/magit-prefix-map)
+  ;; Remove `magit-add-change-log-entry-other-window', which overrides
+  ;; my binding for `km/zsh-ansi-term-other-window'.
+  (define-key magit-mode-map (kbd "C-x 4 a") nil)
 
   (magit-define-popup-action 'magit-commit-popup
     ?u "Auto commit" 'km/magit-auto-commit)
-- 
cgit v1.2.3