summaryrefslogtreecommitdiffstats
path: root/lisp/init-git.el
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2021-03-21 13:48:38 +0100
committerMartin Polden <mpolden@mpolden.no>2021-03-21 13:55:16 +0100
commit20978c89810754735dfb2f27dfc73570cf2f9567 (patch)
tree39d386b4921fc14d722e523f197078f8c9725a4d /lisp/init-git.el
parent4d3fd38cb0218c4382d6121034c0fe0bc75fcec4 (diff)
git: Cleanup
Diffstat (limited to 'lisp/init-git.el')
-rw-r--r--lisp/init-git.el26
1 files changed, 11 insertions, 15 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index a924609..8a293af 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -2,14 +2,6 @@
;;; Commentary:
;;; Code:
-(use-package git-commit
- :ensure t
- :after markdown-mode
-
- :init
- ;; use gfm-mode as major mode
- (setq git-commit-major-mode 'gfm-mode))
-
(defun mpolden/magit-visit-file-other-window (&optional noselect)
"Visit current file in another window.
If NOSELECT is non-nil, do not select the window."
@@ -52,19 +44,23 @@ If NOSELECT is non-nil, do not select the window."
:map forge-issue-section-map
([remap magit-delete-thing] . forge-copy-url-at-point-as-kill)))
+(use-package git-commit
+ :ensure t
+ :after markdown-mode
+ :init
+ ;; use gfm-mode as major mode
+ (setq git-commit-major-mode 'gfm-mode))
+
+(use-package smerge-mode
+ :init
+ (setq smerge-command-prefix (kbd "C-c x")))
+
;; follow symlinks to files under version control
(setq vc-follow-symlinks t)
;; limit vc backends as this may speed up some operations, e.g. tramp
(setq vc-handled-backends '(Git))
-(use-package vc-git
- :after grep)
-
-(use-package smerge-mode
- :init
- (setq smerge-command-prefix (kbd "C-c x")))
-
(provide 'init-git)
;;; init-git.el ends here