[emacs/magit] auto-expand unmerged into upstream and recent commits

[~bandali/configs] / init.org

diff --git a/init.org b/init.org
index 73da39d..b30aebc 100644 (file)
--- a/init.org
+++ b/init.org
@@ -807,6 +807,12 @@ customizing it.
 
   "w"   '(:ignore t :wk "window")
   "w o" 'other-window
 
   "w"   '(:ignore t :wk "window")
   "w o" 'other-window

+  "w 0" 'delete-window
+  "w 1" 'delete-other-windows
+  "w 2" 'split-window-below
+  "w 3" 'split-window-right
+  "w u" 'winner-undo
+  "w r" 'winner-redo

 
   "q"   '(:ignore t :wk "quit")
   "q q" 'save-buffers-kill-terminal)
 
   "q"   '(:ignore t :wk "quit")
   "q q" 'save-buffers-kill-terminal)


@@ -967,6 +973,7 @@ Not just how I do git, but /the/ way to do git.
   (setq
    magit-repository-directories '(("~/.emacs.d/" . 0)
                                   ("~/src/git/" . 1)))
   (setq
    magit-repository-directories '(("~/.emacs.d/" . 0)
                                   ("~/src/git/" . 1)))

+  (push (cons [unpushed status] 'show) magit-section-initial-visibility-alist)

   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 
   :custom-face (magit-diff-file-heading ((t (:weight normal)))))
 #+end_src
 


@@ -1898,6 +1905,9 @@ Hopefully temporary.
    :subscribed-channels '(general)
    :full-and-display-names t)
   (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)
    :subscribed-channels '(general)
    :full-and-display-names t)
   (add-to-list 'swiper-font-lock-exclude 'slack-message-buffer-mode t)

+  (setq lui-time-stamp-format "[%Y-%m-%d %H:%M:%S]"
+        lui-time-stamp-only-when-changed-p t
+        lui-time-stamp-position 'right)

   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)
   :bind
   (("C-c s s" . slack-start)
    ("C-c s u" . slack-select-unread-rooms)


@@ -2088,6 +2098,8 @@ For when I /have to/ use GH.
            (body "\nBest,\namin\n"))
           ("gnu.*"
            (address "bandali@gnu.org"))
            (body "\nBest,\namin\n"))
           ("gnu.*"
            (address "bandali@gnu.org"))

+          ((header "subject" "ThankCRM")
+           (to "webmasters-comment@gnu.org"))

           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))
           ("nnimap\\+uwaterloo:.*"
            (address "abandali@uwaterloo.ca")
            (gcc "\"nnimap+uwaterloo:Sent Items\"")))))