git-gutter

diff --git a/.gitmodules b/.gitmodules
index 7602c46f52db8b16e611b479922aae9aaa07a28f..a1c926b3b356fd1292936cb5fe943d57b9d4326f 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -97,3 +97,12 @@
 [submodule "avy"]
        path = packages/avy
        url = https://github.com/abo-abo/avy.git
+[submodule "git-gutter"]
+       path = packages/git-gutter
+       url = https://github.com/syohex/emacs-git-gutter.git
+[submodule "git-gutter-fringe"]
+       path = packages/git-gutter-fringe
+       url = https://github.com/syohex/emacs-git-gutter-fringe.git
+[submodule "fringe-helper"]
+       path = packages/fringe-helper
+       url = https://github.com/nschum/fringe-helper.el.git

diff --git a/lisp/my-defuns.el b/lisp/my-defuns.el
index ee4d4e49dd6e4fb06d16c1ceaf3d954fa78c36c6..3c51d9b2fd8b4e03787ded616f55ad6cb94d4e7a 100644 (file)
--- a/lisp/my-defuns.el
+++ b/lisp/my-defuns.el
@@ -30,6 +30,11 @@
 (defun my/frame-list-ignoring-initial-frame ()
   (filtered-frame-list (lambda (frame) (not (my/frame-initial-frame-p frame)))))
 
+(defun my/git-reset-buffer ()
+  (interactive)
+  (call-process "git" nil nil nil "reset" (buffer-file-name))
+  (git-gutter))
+
 (defun my/kill-buffer-safely (buffer)
   "Kill the buffer if it is not special or modified"
   (if (and

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 601a7d8aff9a051b05b52612db3d3d272fbc5e7b..e3538f13f6bf9b65b8c5df661de40f9089b527b8 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -15,6 +15,12 @@
 (global-set-key (kbd "C-x c") 'my/kill-buffers-not-in-frame)
 (global-set-key (kbd "C-x C-b") 'ibuffer)
 (global-set-key (kbd "C-x C-r") 'ivy-recentf)
+(global-set-key (kbd "C-c g d") 'git-gutter:popup-hunk)
+(global-set-key (kbd "C-c g p") 'git-gutter:previous-hunk)
+(global-set-key (kbd "C-c g n") 'git-gutter:next-hunk)
+(global-set-key (kbd "C-c g a") 'git-gutter:stage-hunk)
+(global-set-key (kbd "C-c g u") 'git-gutter:revert-hunk)
+(global-set-key (kbd "C-c g r") 'my/git-reset-buffer)
 
 ;; Windows/frames
 (global-set-key (kbd "<C-up>") 'windmove-up)

diff --git a/lisp/my-minor-modes.el b/lisp/my-minor-modes.el
index 7f3c63d2e1f2a6cb177813e5c6f3c18700515892..ad140c20edb9fe35e98c70c5a78dbd59f507ba61 100644 (file)
--- a/lisp/my-minor-modes.el
+++ b/lisp/my-minor-modes.el
@@ -10,6 +10,11 @@
 
 (require 'expand-region)
 
+(require 'git-gutter)
+(require 'git-gutter-fringe)
+(setq git-gutter:ask-p nil)
+(global-git-gutter-mode)
+
 (require 'indent-guide)
 (indent-guide-global-mode)
 
@@ -29,6 +34,7 @@
           (lambda () (set (make-local-variable 'yas-indent-line) 'fixed)))
 
 (require 'diminish)
+(diminish 'git-gutter-mode)
 (diminish 'indent-guide-mode)
 (diminish 'ivy-mode)
 (diminish 'yas-minor-mode)

diff --git a/lisp/my-other-modes.el b/lisp/my-other-modes.el
index de7ef71028e696bb2e8c3f8bf69b7b71a8cd0c13..62b7e7fa2726465105dc7fc5a5293aed7154f2ff 100644 (file)
--- a/lisp/my-other-modes.el
+++ b/lisp/my-other-modes.el
@@ -19,6 +19,9 @@
 (popwin-mode 1)
 (push '(direx:direx-mode :position left :width 40 :dedicated t)
       popwin:special-display-config)
+(push '("*git-gutter:diff*" :stick t)
+      popwin:special-display-config)
+
 (require 'restclient)
 
 (setq require-final-newline t)

diff --git a/packages/fringe-helper b/packages/fringe-helper
new file mode 160000 (submodule)
index 0000000..ef4a9c0
--- /dev/null
+++ b/packages/fringe-helper
@@ -0,0 +1 @@
+Subproject commit ef4a9c023bae18ec1ddd7265f1f2d6d2e775efdd

diff --git a/packages/git-gutter b/packages/git-gutter
new file mode 160000 (submodule)
index 0000000..4678571
--- /dev/null
+++ b/packages/git-gutter
@@ -0,0 +1 @@
+Subproject commit 46785711d9be4ea718bcf738e49e6b6bea805342

diff --git a/packages/git-gutter-fringe b/packages/git-gutter-fringe
new file mode 160000 (submodule)
index 0000000..dfc93d1
--- /dev/null
+++ b/packages/git-gutter-fringe
@@ -0,0 +1 @@
+Subproject commit dfc93d1064df154a809aab350942830408051da3