Move a bunch of configs around to make docker happy.

2018-03-22 16:06:06 -04:00 · 2018-03-22 16:06:06 -04:00 · b138c57d95
commit b138c57d95
parent 4e7f47891a
7 changed files with 5 additions and 17 deletions
--- a/emacs/.emacs
+++ b/emacs/.emacs
--- a/emacs/.emacs.d/lisp/haml-mode.el
+++ b/emacs/.emacs.d/lisp/haml-mode.el
--- a/emacs/.emacs.d/lisp/markdown-mode.el
+++ b/emacs/.emacs.d/lisp/markdown-mode.el
--- a/emacs/.emacs.d/lisp/slim-mode.el
+++ b/emacs/.emacs.d/lisp/slim-mode.el
--- a/emacs/.emacs.d/lisp/yaml-mode.el
+++ b/emacs/.emacs.d/lisp/yaml-mode.el
--- a/git/.gitconfig
+++ b/git/.gitconfig
@ -1,10 +1,12 @@
 [user]
-    name = Anna Wiggins
+	name = Anna Wiggins
    email = annabunches@gmail.com
 	signingkey = EFEF6022
-[push]
-	default = simple
 [commit]
 	gpgsign = true
 [gpg]
 	program = gpg2
+[push]
+	default = simple
+[alias]
+    graph = log --graph --oneline --decorate --all
--- a/git/gitconfig
+++ b/git/gitconfig
@ -1,14 +0,0 @@
-# This is Git's per-user configuration file.
-[user]
-# Please adapt and uncomment the following lines:
-	name = Anna Wiggins
-        email = annabunches@gmail.com
-	signingkey = 0448ED78
-[commit]
-	gpgsign = true
-[gpg]
-	program = gpg2
-[push]
-	default = upstream
-[alias]
-    graph = log --graph --oneline --decorate --all