blob: 6e5d6f93f7bbf726cc7db195f49c9e5d07ab2e93 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
;; use appropiate git-mode for .gitconfig and .gitignore extensions
(use-package gitignore-mode
:mode ("gitignore\\'" . gitignore-mode))
(use-package gitconfig-mode
:mode ("gitconfig\\'" . gitconfig-mode))
(use-package git-commit
:after markdown-mode
:init
;; use gfm-mode as major mode
(setq git-commit-major-mode 'gfm-mode))
(defun magit-visit-file-other-window (&optional noselect)
"Visit current file in another window."
(interactive)
(let ((current-window (selected-window)))
(call-interactively 'magit-diff-visit-file-other-window)
(when noselect
(select-window current-window))))
(defun magit-visit-file-other-window-noselect ()
"Visit current file in another window, but don't select it."
(interactive)
(magit-visit-file-other-window t))
(use-package magit
:init
;; disable gravatars
(setq magit-revision-show-gravatars nil)
;; hide recent commits in magit-status
(setq magit-log-section-commit-count 0)
;; set the default directory for git repositories
(let ((project-dir "~/p"))
(when (and (not (boundp 'magit-repository-directories)) (file-directory-p project-dir))
(setq magit-repository-directories (list (cons project-dir 1)))))
:bind (("C-x m" . magit-status)
("C-c b" . magit-blame)
:map magit-status-mode-map
;; make C-o and o behave as in dired
("o" . magit-visit-file-other-window)
("C-o" . magit-visit-file-other-window-noselect)))
(use-package forge
:after magit
:init
;; limit number of topics listed in status buffer
(setq forge-topic-list-limit '(10 . 0)))
;; follow symlinks to files under version control
(setq vc-follow-symlinks t)
(use-package smerge-mode
:ensure nil ;; package is bundled with emacs
:init
(setq smerge-command-prefix (kbd "C-c x")))
(provide 'init-git)
|
