diff --git a/.gitignore b/.gitignore
index 638dc70d13e..9550b0773f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,19 @@
+# temporary editor files
+*~
+.#*
+\#*#
+
 # IDE configuration files
 .idea
 .spyder*
 .ropeproject
 .vscode
+
 # Python generates numerous files when byte compiling / installing packages
+__pycache__/
 *.pyx
-*.pyc
-*.pyo
-*.egg-info
+*.py[cod]
+*.egg-info/
 
 # Documentation builds
 doc/OnlineDocs/_build
@@ -17,6 +23,7 @@ doc/OnlineDocs/**/*.spy
 *.out
 pyomo/dataportal/parse_table_datacmds.py
 gurobi.log
+cplex.log
 
 # Results from pytest --with-coverage
 .coverage
@@ -24,7 +31,6 @@ gurobi.log
 
 # Jupyterhub/Jupyterlab checkpoints
 .ipynb_checkpoints
-cplex.log
 
 # Mac tracking files
 *.DS_Store*