From 01e96a06aaa613b31712fe2e20371f79f2aaf52e Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun, 8 Dec 2019 00:46:51 +0100
Subject: [PATCH 1/2] Update 3 drones

Update forge        to v0.1.0-265-g54f570df
Update magit-imerge to v1.0.0-12-ga7357ab
Update orgit        to v1.6.0
---
 lib/forge        | 2 +-
 lib/magit-imerge | 2 +-
 lib/orgit        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/forge b/lib/forge
index 63cbf81..54f570d 160000
--- a/lib/forge
+++ b/lib/forge
@@ -1 +1 @@
-Subproject commit 63cbf81f166fc71861d8e3d246df8e5ccedcb9bb
+Subproject commit 54f570dfa06f8c5a3b67ca208bb78a52bbaa798c
diff --git a/lib/magit-imerge b/lib/magit-imerge
index 54f2e25..a7357ab 160000
--- a/lib/magit-imerge
+++ b/lib/magit-imerge
@@ -1 +1 @@
-Subproject commit 54f2e25eb5f9e9763a60808ecfc1edef7f276ce0
+Subproject commit a7357ab87c89187234fe333bb869727c417638d1
diff --git a/lib/orgit b/lib/orgit
index 1e578f8..e7cddf3 160000
--- a/lib/orgit
+++ b/lib/orgit
@@ -1 +1 @@
-Subproject commit 1e578f8cf97b07835f02858f05a094ae9a5e99bb
+Subproject commit e7cddf39e301c87c36c7de13e429dee74874d5c8

From 1a4c3c0c9bb748cf61a2a89d60a8a893aeed06d1 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun, 8 Dec 2019 00:48:24 +0100
Subject: [PATCH 2/2] magit: Discourage pulling

IMO one should separate the tasks of fetching and merging/rebasing,
which means we shouldn't make it *easier* to pull, obviously.
---
 init.el | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/init.el b/init.el
index ad44b07..18d43ff 100644
--- a/init.el
+++ b/init.el
@@ -136,9 +136,6 @@
   :bind (("C-x g"   . magit-status)
          ("C-x M-g" . magit-dispatch))
   :config
-  (setq magit-pull-or-fetch t)
-  (define-key magit-mode-map "f" 'magit-pull)
-  (define-key magit-mode-map "F" nil)
   (define-key magit-file-mode-map (kbd "C-c g") 'magit-file-dispatch)
   ;;
   ;; Disable safety nets