From d13d173569995c41159a6d83d98c25b3f912f798 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 21 Sep 2020 12:36:51 +0000
Subject: [PATCH] Added some words, updated emacs, rebase bu default on pull

---
 aspell/.aspell.en.pws |    9 ++++++++-
 emacs/.emacs.d        |    2 +-
 git/.gitconfig        |    2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/aspell/.aspell.en.pws b/aspell/.aspell.en.pws
index a169e76..c5d45e5 100644
--- a/aspell/.aspell.en.pws
+++ b/aspell/.aspell.en.pws
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 28 
+personal_ws-1.1 en 35 
 Adapter
 DNS
 FPGA
@@ -6,8 +6,10 @@
 Grunbaum
 SODIMM
 abortifacient
+achiral
 adapter
 adapters
+chiral
 config
 dotfiles
 fortifiable
@@ -23,7 +25,12 @@
 polymorphically
 polymorphism
 preconfigured
+proportionalities
+resistive
 retransmission
 siemens
 sinusoid
+solubilities
 undamped
+understandability
+windings
diff --git a/emacs/.emacs.d b/emacs/.emacs.d
index 657f703..f1b53f1 160000
--- a/emacs/.emacs.d
+++ b/emacs/.emacs.d
@@ -1 +1 @@
-Subproject commit 657f70339f3a4420a19d1c9b23681cc6f06af6df
+Subproject commit f1b53f1d0de894cf572018ca44cb82bf8b3cd297
diff --git a/git/.gitconfig b/git/.gitconfig
index 9a72e44..fdf61bd 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,3 +3,5 @@
 [user]
 	name = Joel Grunbaum
 	email = joelgrun@gmail.com
+[pull]
+	rebase = false

--
Gitblit v1.9.3