From bbc47f3a6266a46cd4dd29b0766944dfde52b935 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu, 11 Jan 2018 12:06:00 +0100
Subject: [PATCH 1/4] magit: Add magit-insert-worktrees to
 magit-status-sections-hook

---
 init.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/init.el b/init.el
index ed2caa2..6eb59e6 100644
--- a/init.el
+++ b/init.el
@@ -179,6 +179,10 @@
                           'magit-insert-modules
                           'magit-insert-stashes
                           'append)
+  (magit-add-section-hook 'magit-status-sections-hook
+                          'magit-insert-worktrees
+                          'magit-insert-modules
+                          'append)
   ;;
   ;; Diff buffer settings
   (setq magit-diff-refine-hunk 'all))

From 63daede5e70131b18f05d1e5b4bd03fa46c1967b Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu, 11 Jan 2018 12:07:00 +0100
Subject: [PATCH 2/4] magit: Don't require confirmation for
 magit-stash-{pop,drop}

---
 init.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/init.el b/init.el
index 6eb59e6..d9b9204 100644
--- a/init.el
+++ b/init.el
@@ -141,6 +141,8 @@
   ;; Disable safety nets
   (setq magit-commit-squash-confirm nil)
   (setq magit-save-repository-buffers 'dontask)
+  (setf (nth 2 (assq 'magit-stash-pop  magit-dwim-selection)) t)
+  (setf (nth 2 (assq 'magit-stash-drop magit-dwim-selection)) t)
   (add-to-list 'magit-no-confirm 'safe-with-wip t)
   (add-to-list 'magit-no-confirm 'rename t)
   (add-to-list 'magit-no-confirm 'resurrect t)

From 58aeeea86c0abeed3f740f6ed190f558aa0a837e Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu, 11 Jan 2018 12:08:00 +0100
Subject: [PATCH 3/4] magit-rockstar: Don't add magit-branch-pull-request to
 popup

That command is now defined in Magit itself
and a member of `magit-branch-popup' by default.
---
 init.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/init.el b/init.el
index d9b9204..0396123 100644
--- a/init.el
+++ b/init.el
@@ -196,9 +196,7 @@
   (magit-define-popup-action 'magit-commit-popup
     ?n "Reshelve" 'magit-reshelve)
   (magit-define-popup-action 'magit-rebase-popup
-    ?R "Rockstar" 'magit-rockstar)
-  (magit-define-popup-action 'magit-branch-popup
-    ?p "Create from pull-request" 'magit-branch-pull-request))
+    ?R "Rockstar" 'magit-rockstar))
 
 (use-package magit-wip
   :after magit

From 7ac2bf1f7338f1cabdca7c3a355e7d3c9ea00b32 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Thu, 11 Jan 2018 12:09:00 +0100
Subject: [PATCH 4/4] magit-rockstar: Place magit-rockstar more nicely

---
 init.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/init.el b/init.el
index 0396123..d90c42b 100644
--- a/init.el
+++ b/init.el
@@ -195,8 +195,9 @@
   :config
   (magit-define-popup-action 'magit-commit-popup
     ?n "Reshelve" 'magit-reshelve)
-  (magit-define-popup-action 'magit-rebase-popup
-    ?R "Rockstar" 'magit-rockstar))
+  (plist-put magit-rebase-popup :actions
+             (-replace-at 11 '(?R "to change dates" magit-rockstar)
+                          (plist-get magit-rebase-popup :actions))))
 
 (use-package magit-wip
   :after magit