magit

diff --git a/.gitmodules b/.gitmodules
index 80d2e21c723a2751f9193ece85e5f78660573cc7..accb2d225d8cc2b329b8c55ba36d9ed266b55d84 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -94,15 +94,18 @@
 [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
 [submodule "shackle"]
        path = packages/shackle
        url = https://github.com/wasamasa/shackle.git
 [submodule "hl-todo"]
        path = packages/hl-todo
        url = https://github.com/tarsius/hl-todo.git
+[submodule "magit"]
+       path = packages/magit
+       url = https://github.com/magit/magit.git
+[submodule "emacs-async"]
+       path = packages/async
+       url = https://github.com/jwiegley/emacs-async.git
+[submodule "with-editor"]
+       path = packages/with-editor
+       url = https://github.com/magit/with-editor.git

diff --git a/README.md b/README.md
index 23568ee31510ae8350a0fb222752d482808f0221..d4a32ce1db12400ecece446cb76642878ae5d4f8 100644 (file)
--- a/README.md
+++ b/README.md
@@ -200,6 +200,7 @@ F4                                              Play back macro
 # Mode switching
 ```
 C-x C-j                                         Open direx at current file
+C-c g s                                         Magit status
 F8                                              Toggle flyspell-mode
 F9                                              Toggle whitespace mode
 F10                                             Toggle word wrap
@@ -226,6 +227,25 @@ M-g M-p                                         Previous occurence
 M-g M-n                                         Next occurence
 ```
 
+# Magit / Git gutter
+```
+C-c g d                                         Popup diff
+C-c g p                                         Previous hunk
+C-c g f                                         Next hunk
+C-c g s                                         Magit status
+C-c g g                                         Magit dispatch popup
+p                                               Previous section
+n                                               Next section
+M-p                                             Previous sibling section
+M-n                                             Next sibling section
+^                                               Up section
+Tab                                             Toggle visibility of section
+C-Tab                                           Cycle visibility of section and its children
+q                                               Kill window and bury buffer
+C-c C-c                                         Perform action
+C-c C-k                                         Cancel action
+```
+
 # Lisp
 ```
 C-M-x                                           Eval top-level form

diff --git a/lisp/my-keys.el b/lisp/my-keys.el
index 3cb9160b5bdce674e2f1eb0e5d243fdc013ba028..e0f0ec9aa534e9f185ee1edff171b94abc81bb61 100644 (file)
--- a/lisp/my-keys.el
+++ b/lisp/my-keys.el
@@ -22,9 +22,6 @@
 (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)
@@ -61,6 +58,8 @@
 
 ;; Mode switching
 (global-set-key (kbd "C-x C-j") 'direx-project:jump-to-project-root-other-window)
+(global-set-key (kbd "C-c g s") 'magit-status)
+(global-set-key (kbd "C-c g g") 'magit-dispatch-popup)
 (global-set-key (kbd "<f8>") 'flyspell-mode)
 (global-set-key (kbd "<f9>") 'whitespace-mode)
 (global-set-key (kbd "<f10>") 'toggle-truncate-lines)

diff --git a/lisp/my-shackle.el b/lisp/my-shackle.el
index b81a438d970a070929b1ce76f3e0c7c8801700a6..a9ac44cc8edf2af6628de980dbd3e6ea5d04583d 100644 (file)
--- a/lisp/my-shackle.el
+++ b/lisp/my-shackle.el
@@ -3,11 +3,12 @@
 (require 'shackle)
 
 (setq shackle-rules '(((:custom buffer-file-name) :other t)
-                      (direx:direx-mode :align left :size 40 :select t)))
+                      (direx:direx-mode :align left :size 40 :select t)
+                      ("*magit-.*-popup*" :regexp t :align right :size 63 :select t)
+                      (magit-status-mode :align below :size 20 :select t)
+                      (magit-diff-mode :align right)))
 
-(setq shackle-default-rule '(:align t :select t :size 15))
-
-(setq shackle-default-alignment 'below)
+(setq shackle-default-rule '(:align below :select t :size 15))
 
 (setq shackle-default-size 0.5)
 

diff --git a/lisp/my-vc.el b/lisp/my-vc.el
index cba3ea98019e6f2f4456e5f02ccb32fcef8ce32e..a2b65de5d3d9f824f404a8bdfef4a5b4c9ee23b8 100644 (file)
--- a/lisp/my-vc.el
+++ b/lisp/my-vc.el
@@ -6,7 +6,8 @@
 
 
 (require 'git-gutter)
-(require 'git-gutter-fringe)
+
+(add-hook 'git-gutter:update-hooks 'magit-revert-buffer-hook)
 
 (setq git-gutter:ask-p nil)
 
@@ -21,15 +22,6 @@
 
 
 
-(defun my/git-reset-buffer ()
-  "Runs git-reset to unstage all changes on the current file. Then updates the git-gutter."
-  (interactive)
-  (call-process "git" nil nil nil "reset" (buffer-file-name))
-  (git-gutter)
-  (message "Finished git reset"))
-
-
-
 (require 'ibuffer-vc)
 
 (add-hook 'ibuffer-hook
@@ -40,5 +32,14 @@
 
 
 
+(require 'magit)
+
+(setq magit-completing-read-function 'ivy-completing-read)
+(setq magit-display-file-buffer-function #'pop-to-buffer)
+(global-magit-file-mode)
+
+
+
 (require 'vc)
 (setq vc-follow-symlinks t)
+(setq vc-handled-backends nil)

diff --git a/packages/async b/packages/async
new file mode 160000 (submodule)
index 0000000..8bc0678
--- /dev/null
+++ b/packages/async
@@ -0,0 +1 @@
+Subproject commit 8bc0678ebca97e7b1c6e78e75e03f8dfd502d63a

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

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

diff --git a/packages/magit b/packages/magit
new file mode 160000 (submodule)
index 0000000..5834d0d
--- /dev/null
+++ b/packages/magit
@@ -0,0 +1 @@
+Subproject commit 5834d0dbd471af0ce6537b4fc020fac05701267b

diff --git a/packages/with-editor b/packages/with-editor
new file mode 160000 (submodule)
index 0000000..d28d074
--- /dev/null
+++ b/packages/with-editor
@@ -0,0 +1 @@
+Subproject commit d28d07497f67fea4c62fe7a2d3201fd86fb64fe2