summaryrefslogtreecommitdiff
path: root/lisp/init-git.el
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-01-26 02:00:22 -0500
committerKyle Meyer <kyle@kyleam.com>2014-01-26 02:00:22 -0500
commit4bcfb672357b5840249c72b28cb860001c4e3967 (patch)
tree13e236eaccfdf6985e576f3b07bdec937f2f7955 /lisp/init-git.el
parent7869360008d87ca4b459c703f4894625dd8181cc (diff)
downloademacs.d-4bcfb672357b5840249c72b28cb860001c4e3967.tar.gz
Reorganize and use require-package
`require-package' is from https://github.com/purcell/emacs.d/blob/master/lisp/init-elpa.el.
Diffstat (limited to 'lisp/init-git.el')
-rw-r--r--lisp/init-git.el20
1 files changed, 11 insertions, 9 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 2f9316d..0b5d420 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -1,8 +1,10 @@
-(require 'git-annex)
+(require-package 'magit)
+(require-package 'git-commit-mode)
+(require-package 'git-annex)
(setq git-annex-commit nil)
-(require 'magit)
+(key-chord-define-global ",g" 'magit-status)
(defun km/magit-auto-commit ()
"Commit all changes with \"auto\" commit message.
@@ -10,18 +12,18 @@ Useful for non-source code repos (e.g., Org mode note files)."
(interactive)
(magit-run-git "commit" "--all" "--message=auto"))
-(magit-key-mode-insert-action 'committing
- "u" "Auto commit" 'km/magit-auto-commit)
+
+(eval-after-load 'magit
+ '(magit-key-mode-insert-action 'committing
+ "u" "Auto commit" 'km/magit-auto-commit))
;; http://whattheemacsd.com/setup-magit.el-01.html
(defadvice magit-status (around magit-fullscreen activate)
ad-do-it
(delete-other-windows))
-(setq magit-restore-window-configuration t)
-
-(setq magit-default-tracking-name-function 'magit-default-tracking-name-branch-only)
-
-(setq magit-log-show-margin nil)
+(setq magit-restore-window-configuration t
+ magit-default-tracking-name-function 'magit-default-tracking-name-branch-only
+ magit-log-show-margin nil)
(provide 'init-git)