diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2014-04-09 22:22:27 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2014-04-09 22:22:27 -0400 |
| commit | 708898b38ee15c37d99afa0e34f7d7462217a1f3 (patch) | |
| tree | fe36f451783c1d79330a6082fdababc5a70fc94f | |
| parent | ef301a56bd6a3b57e35df7b63ad1f5c087a8bb96 (diff) | |
| download | emacs.d-708898b38ee15c37d99afa0e34f7d7462217a1f3.tar.gz | |
Switch to "next" branch of Magit
| -rw-r--r-- | lisp/init-git.el | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el index 65943d3..2ca4d96 100644 --- a/lisp/init-git.el +++ b/lisp/init-git.el @@ -1,5 +1,7 @@ -(require-package 'magit) -(require-package 'git-commit-mode) +(add-to-list 'load-path "~/src/emacs/git-modes") +(add-to-list 'load-path "~/src/emacs/magit") +(require 'magit) + (require-package 'git-annex) (require 'git-annex) @@ -19,13 +21,13 @@ Useful for non-source code repos (e.g., Org mode note files)." (let ((remote (magit-read-remote "Remote"))) (magit-run-git-async "push" "-v" remote "--all"))) -(eval-after-load 'magit - '(progn - (magit-key-mode-insert-action 'committing - "u" "Auto commit" 'km/magit-auto-commit) - (magit-key-mode-insert-action 'pushing - "a" "Push all" 'km/magit-push-all) - (diminish 'magit-auto-revert-mode))) +(magit-define-popup-action 'magit-commit-popup + ?u "Auto commit" 'km/magit-auto-commit) +(magit-define-popup-action 'magit-push-popup + ?a "Push all" 'km/magit-push-all) + + +(diminish 'magit-auto-revert-mode) ;; http://whattheemacsd.com/setup-magit.el-01.html (defadvice magit-status (around magit-fullscreen activate) |