From 61565b66e13243ddeed36e6ffac7a9c09291997e Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Fri, 21 Jul 2023 16:39:52 -0300
Subject: [PATCH 1/5] Updated HISTORY

---
 HISTORY.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/HISTORY.md b/HISTORY.md
index c4e57b8b0..07cd264ac 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,14 +1,14 @@
 # Release history
 
-### GitHub main branch
+### v0.10.0
 
-- Updated keyboard interrupt logic so that 2 ^C in 2 seconds always forces aider to exit.
-- Check pypi for newer versions and notify user.
-- Provide GPT with detailed error if it makes a bad edit block, ask for a retry.
-- Force `--no-pretty` if aider detects it is running inside a VSCode terminal.
+- Added `/git` command to run git from inside aider chats.
 - Use Meta-ENTER (Esc+ENTER in some environments) to enter multiline chat messages.
 - Create a `.gitignore` with `.aider*` to prevent users from accidentaly adding aider files to git.
-- Added `/git` command to run git from inside aider chats.
+- Check pypi for newer versions and notify user.
+- Updated keyboard interrupt logic so that 2 ^C in 2 seconds always forces aider to exit.
+- Provide GPT with detailed error if it makes a bad edit block, ask for a retry.
+- Force `--no-pretty` if aider detects it is running inside a VSCode terminal.
 - [Benchmarked](https://aider.chat/docs/benchmarks.html) at 64.7% for gpt-4/diff (no regression)
 
 

From 4e40c8ac15d45150425271b7ee406be7d04c9477 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sat, 22 Jul 2023 08:51:57 -0300
Subject: [PATCH 2/5] make .gitignore before making repo

---
 aider/main.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/aider/main.py b/aider/main.py
index 7008bf943..865ad0819 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -27,6 +27,10 @@ def setup_git(git_root, io):
     if not io.confirm_ask("No git repo found, create one to track GPT's changes (recommended)?"):
         return
 
+    git_root = str(Path.cwd().resolve())
+
+    check_gitignore(git_root, io, False)
+
     repo = git.Repo.init(Path.cwd())
     global_git_config = git.GitConfigParser([str(Path.home() / ".gitconfig")], read_only=True)
     with repo.config_writer() as git_config:
@@ -38,8 +42,7 @@ def setup_git(git_root, io):
             io.tool_error('Update git email with: git config --global user.email "you@example.com"')
 
     io.tool_output("Git repository created in the current working directory.")
-    git_root = str(Path.cwd().resolve())
-    check_gitignore(git_root, io, False)
+
     return git_root
 
 

From 3ac98b32617a6301096e207894daa9f02001ed2e Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sat, 22 Jul 2023 08:56:40 -0300
Subject: [PATCH 3/5] cleanup

---
 aider/main.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aider/main.py b/aider/main.py
index 865ad0819..8841aeb83 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -31,7 +31,7 @@ def setup_git(git_root, io):
 
     check_gitignore(git_root, io, False)
 
-    repo = git.Repo.init(Path.cwd())
+    repo = git.Repo.init(git_root)
     global_git_config = git.GitConfigParser([str(Path.home() / ".gitconfig")], read_only=True)
     with repo.config_writer() as git_config:
         if not global_git_config.has_option("user", "name"):
@@ -43,7 +43,7 @@ def setup_git(git_root, io):
 
     io.tool_output("Git repository created in the current working directory.")
 
-    return git_root
+    return repo.working_tree_dir
 
 
 def check_gitignore(git_root, io, ask=True):

From a1ff22dc20336f1f2c3ff06f37824b79b440fce4 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sat, 22 Jul 2023 09:02:03 -0300
Subject: [PATCH 4/5] version bump to 0.10.0

---
 aider/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aider/__init__.py b/aider/__init__.py
index 0dffdf106..61fb31cae 100644
--- a/aider/__init__.py
+++ b/aider/__init__.py
@@ -1 +1 @@
-__version__ = "0.9.1-dev"
+__version__ = "0.10.0"

From 0e9dbddfde253b02393289b45568b9f51ed178d7 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <aider@paulg.org>
Date: Sat, 22 Jul 2023 09:02:19 -0300
Subject: [PATCH 5/5] set version to 0.10.0-dev

---
 aider/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aider/__init__.py b/aider/__init__.py
index 61fb31cae..688f876d6 100644
--- a/aider/__init__.py
+++ b/aider/__init__.py
@@ -1 +1 @@
-__version__ = "0.10.0"
+__version__ = "0.10.1-dev"