From cb2c3f351757be8a702ed13ebd76bed847ed7b11 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Tue, 18 Nov 2014 22:18:02 -0500 Subject: 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 --- lisp/init-git.el | 7 +++++-- 1 file 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) -- cgit v1.2.3