summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Meyer <kyle@kyleam.com>2014-11-18 22:18:02 -0500
committerKyle Meyer <kyle@kyleam.com>2014-11-18 22:18:02 -0500
commitcb2c3f351757be8a702ed13ebd76bed847ed7b11 (patch)
treed31392bb83ccb84aa375bd6ed343b8d1bc59efdc
parent96bc6b11c883ad8db78f91d4e8036cfd1de1b279 (diff)
downloademacs.d-cb2c3f351757be8a702ed13ebd76bed847ed7b11.tar.gz
Update Magit and git-modes setup
Magit now contains git-commit-mode.el, git-rebase-model.el, and with-editor.el from the git-modes repo. Magit commit 6e601926278a833baed7a9f44f7f6a360be203da
-rw-r--r--lisp/init-git.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/init-git.el b/lisp/init-git.el
index 8cfa317..dec7309 100644
--- a/lisp/init-git.el
+++ b/lisp/init-git.el
@@ -1,9 +1,7 @@
-(add-to-list 'load-path "~/src/emacs/git-modes")
(add-to-list 'load-path "~/src/emacs/magit")
(add-to-list 'load-path "~/src/emacs/orgit")
(require 'magit-autoloads)
-(require 'git-modes-autoloads)
(require 'orgit)
@@ -12,6 +10,11 @@
(require-package 'git-timemachine)
+(require-package 'git-timemachine)
+(require-package 'gitconfig-mode)
+(require-package'gitignore-mode)
+(require-package 'gitattributes-mode)
+
(setq git-annex-commit nil)
(require 'magit-annex-autoloads)