diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index e43fc98b1..22694cf1e 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1436,8 +1436,8 @@ class Coder:
         return context
 
     def auto_commit(self, edited):
-        # context = self.get_context_from_history(self.cur_messages)
-        res = self.repo.commit(fnames=edited, aider_edits=True)
+        context = self.get_context_from_history(self.cur_messages)
+        res = self.repo.commit(fnames=edited, context=context, aider_edits=True)
         if res:
             commit_hash, commit_message = res
             self.last_aider_commit_hash = commit_hash
diff --git a/aider/repo.py b/aider/repo.py
index 6e3465697..558343865 100644
--- a/aider/repo.py
+++ b/aider/repo.py
@@ -93,8 +93,8 @@ class GitRepo:
             commit_message = "(no commit message provided)"
 
         full_commit_message = commit_message
-        if context:
-            full_commit_message += "\n\n# Aider chat conversation:\n\n" + context
+        # if context:
+        #    full_commit_message += "\n\n# Aider chat conversation:\n\n" + context
 
         cmd = ["-m", full_commit_message, "--no-verify"]
         if fnames: