2021-08-17 11:49:19 +00:00
|
|
|
;;; init-git.el --- VCS/Git Configuration File -*- lexical-binding: t -*-
|
|
|
|
;;; Commentary:
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(use-package ediff
|
|
|
|
:custom
|
|
|
|
(ediff-setup-windows-plain 'ediff-setup-windows-plain))
|
|
|
|
|
|
|
|
(use-package diff-hl
|
|
|
|
:config
|
|
|
|
(global-diff-hl-mode +1)
|
|
|
|
:hook
|
|
|
|
(dired-mode . diff-hl-dired-mode)
|
|
|
|
(magit-post-refresh . diff-hl-magit-post-refresh))
|
|
|
|
|
2022-08-30 11:53:46 +00:00
|
|
|
(use-package gitconfig
|
|
|
|
:defer 5)
|
|
|
|
|
|
|
|
(use-package git-modes
|
|
|
|
:defer 5)
|
|
|
|
|
2022-08-13 10:36:35 +00:00
|
|
|
(use-package git-timemachine
|
2022-08-30 11:53:46 +00:00
|
|
|
:defer 5
|
2022-08-13 10:36:35 +00:00
|
|
|
:bind
|
|
|
|
("C-x v t" . git-timemachine-toggle))
|
2021-08-17 11:49:19 +00:00
|
|
|
|
|
|
|
(use-package magit
|
|
|
|
:bind
|
2022-05-19 06:45:07 +00:00
|
|
|
("C-c g g" . magit-dispatch) ;; magit-file-dispatch is C-c M-g
|
|
|
|
("C-c g u" . my/magit-set-upstream)
|
|
|
|
("C-c g r" . my/magit-refresh-state)
|
2021-08-17 11:49:19 +00:00
|
|
|
:config
|
2021-12-22 12:57:21 +00:00
|
|
|
;; Requires the following gitconfig:
|
|
|
|
;; [alias]
|
|
|
|
;; upstream = !git push -u origin HEAD
|
|
|
|
;; TODO - this is useful after setting push remote, but is there a better way?
|
2021-08-17 11:49:19 +00:00
|
|
|
(defun my/magit-set-upstream ()
|
|
|
|
(interactive)
|
|
|
|
(magit-shell-command-topdir "git upstream"))
|
|
|
|
;; update stale git info on the modeline (based on code removed from doom modeline)
|
|
|
|
(defun my/magit-refresh-state ()
|
|
|
|
(interactive)
|
|
|
|
(dolist (buf (buffer-list))
|
|
|
|
(when (and (not (buffer-modified-p buf))
|
|
|
|
(buffer-file-name buf)
|
|
|
|
(file-exists-p (buffer-file-name buf))
|
|
|
|
(file-in-directory-p (buffer-file-name buf) (magit-toplevel)))
|
|
|
|
(with-current-buffer buf
|
|
|
|
(vc-refresh-state)))))
|
|
|
|
:custom
|
|
|
|
(magit-diff-refine-hunk 'all)
|
2021-08-18 14:00:22 +00:00
|
|
|
(magit-diff-paint-whitespace-lines 'all)
|
2021-08-19 13:45:17 +00:00
|
|
|
(magit-diff-refine-ignore-whitespace nil)
|
2021-08-18 14:00:22 +00:00
|
|
|
(magit-diff-highlight-trailing t))
|
2021-08-17 11:49:19 +00:00
|
|
|
|
|
|
|
(use-package forge
|
|
|
|
:after magit)
|
|
|
|
|
|
|
|
(use-package git-gutter
|
|
|
|
:diminish
|
|
|
|
:bind
|
|
|
|
("C-c j g" . git-gutter-mode)
|
|
|
|
("C-c j S-g" . git-gutter)
|
|
|
|
("C-c j n" . git-gutter:next-hunk)
|
|
|
|
("C-c j p" . git-gutter:previous-hunk)
|
|
|
|
("C-c j r" . git-gutter:revert-hunk)
|
|
|
|
("C-c j d" . git-gutter:popup-hunk))
|
|
|
|
|
|
|
|
(provide 'init-git)
|
|
|
|
;;; init-git.el ends here
|