mirror of
https://github.com/larstvei/dot-emacs.git
synced 2024-11-26 07:28:31 +00:00
use-package diff-hl and magit
This commit is contained in:
parent
bff3e0b95f
commit
dd7814950c
36
init.org
36
init.org
@ -207,8 +207,7 @@
|
|||||||
|
|
||||||
(let* ((package--builtins nil)
|
(let* ((package--builtins nil)
|
||||||
(packages
|
(packages
|
||||||
'(diff-hl ; Highlight uncommitted changes using VC
|
'(direnv ; direnv integration
|
||||||
direnv ; direnv integration
|
|
||||||
editorconfig ; EditorConfig Emacs Plugin
|
editorconfig ; EditorConfig Emacs Plugin
|
||||||
erlang ; Erlang major mode
|
erlang ; Erlang major mode
|
||||||
expand-region ; Increase selected region by semantic units
|
expand-region ; Increase selected region by semantic units
|
||||||
@ -216,7 +215,6 @@
|
|||||||
go-mode ; Major mode for the Go programming language
|
go-mode ; Major mode for the Go programming language
|
||||||
haskell-mode ; A Haskell editing mode
|
haskell-mode ; A Haskell editing mode
|
||||||
lua-mode ; a major-mode for editing Lua scripts
|
lua-mode ; a major-mode for editing Lua scripts
|
||||||
magit ; control Git from Emacs
|
|
||||||
markdown-mode ; Emacs Major mode for Markdown-formatted files
|
markdown-mode ; Emacs Major mode for Markdown-formatted files
|
||||||
maude-mode ; Emacs mode for the programming language Maude
|
maude-mode ; Emacs mode for the programming language Maude
|
||||||
minizinc-mode ; Major mode for MiniZinc code
|
minizinc-mode ; Major mode for MiniZinc code
|
||||||
@ -414,7 +412,6 @@
|
|||||||
delete-selection-mode ; Replace selected text
|
delete-selection-mode ; Replace selected text
|
||||||
dirtrack-mode ; directory tracking in *shell*
|
dirtrack-mode ; directory tracking in *shell*
|
||||||
editorconfig-mode ; Use editorconfig
|
editorconfig-mode ; Use editorconfig
|
||||||
global-diff-hl-mode ; Highlight uncommitted changes
|
|
||||||
global-so-long-mode ; Mitigate performance for long lines
|
global-so-long-mode ; Mitigate performance for long lines
|
||||||
recentf-mode ; Recently opened files
|
recentf-mode ; Recently opened files
|
||||||
show-paren-mode ; Highlight matching parentheses
|
show-paren-mode ; Highlight matching parentheses
|
||||||
@ -563,6 +560,29 @@
|
|||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
|
* Version control
|
||||||
|
|
||||||
|
Magit is the best.
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
|
||||||
|
;; A Git porcelain inside Emacs.
|
||||||
|
(use-package magit
|
||||||
|
:bind (("C-c m" . magit-status)))
|
||||||
|
|
||||||
|
#+end_src
|
||||||
|
|
||||||
|
Have some visual indication where there are uncommitted changes.
|
||||||
|
|
||||||
|
#+begin_src emacs-lisp
|
||||||
|
|
||||||
|
;; Highlight uncommitted changes using VC
|
||||||
|
(use-package diff-hl
|
||||||
|
:config
|
||||||
|
(global-diff-hl-mode 1))
|
||||||
|
|
||||||
|
#+end_src
|
||||||
|
|
||||||
* Dashboard
|
* Dashboard
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
@ -1623,14 +1643,6 @@
|
|||||||
|
|
||||||
#+end_src
|
#+end_src
|
||||||
|
|
||||||
** Bindings for [[https://magit.vc/][Magit]]
|
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
|
||||||
|
|
||||||
(define-key custom-bindings-map (kbd "C-c m") 'magit-status)
|
|
||||||
|
|
||||||
#+end_src
|
|
||||||
|
|
||||||
** Bindings for [[https://github.com/bbatsov/projectile][Projectile]]
|
** Bindings for [[https://github.com/bbatsov/projectile][Projectile]]
|
||||||
|
|
||||||
#+begin_src emacs-lisp
|
#+begin_src emacs-lisp
|
||||||
|
Loading…
Reference in New Issue
Block a user