From 968095b36d98cde447fb1725b5c07a5ebe962051 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Tue, 22 Aug 2023 07:45:17 -0700 Subject: [PATCH] Updated HISTORY --- HISTORY.md | 2 +- docs/faq.md | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index bacf233c3cb..343ebed686d 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,7 +2,7 @@ ### main branch -- [Only git commit dirty files that GPT tries to edit](https://github.com/paul-gauthier/aider/issues/200#issuecomment-1682750798) +- [Only git commit dirty files that GPT tries to edit](https://aider.chat/docs/faq.html#how-did-v0-13-0-change-git-usage) - Send chat history as prompt/context for Whisper voice transcription - Added `--voice-language` switch to constrain `/voice` to transcribe to a specific language - Late-bind importing `sounddevice`, as it was slowing down aider startup diff --git a/docs/faq.md b/docs/faq.md index 954fff27bb4..4b0765475e7 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -21,11 +21,11 @@ Aider specifically uses git in these ways: - It asks to create a git repo if you launch it in a directory without one. - Whenever GPT edits a file, aider commits those changes with a descriptive commit message. This makes it easy to undo or review GPT's changes. - - Aider takes special care if GPT tries to edit files that already have uncommitted changes (dirty files). Aider will first commit any preexisting changes with a descriptive commit message. This makes sure you never lose your work if GPT makes an inappropriate change. + - Aider takes special care if GPT tries to edit files that already have uncommitted changes (dirty files). Aider will first commit any preexisting changes with a descriptive commit message. This keeps your edits separate from GPT's edits, and makes sure you never lose your work if GPT makes an inappropriate change. Aider also allows you to use in-chat commands to `/diff` or `/undo` the last change made by GPT. To do more complex management of your git history, you cat use raw `git` commands, -either by using `/git` within your chat, or with git tools outside of aider. +either by using `/git` within the chat, or with standard git tools outside of aider. While it is not recommended, you can disable aider's use of git in a few ways: @@ -33,6 +33,18 @@ While it is not recommended, you can disable aider's use of git in a few ways: - `--no-dirty-commits` will stop aider from committing dirty files before applying GPT's edits. - `--no-git` will completely stop aider from using git on your files. You should ensure you are keeping sensible backups of the files you are working with. +### How did v0.13.0 change git usage? + +As of v0.13.0, aider works with git in a more streamlined manner. +Previously, aider would *always* prompt you +if it noticed that you had uncommitted changes *anywhere* in your repo. + +Now aider only pays attention to uncommitted changes in files +that GPT attempts to edit. +And aider doesn't interrupt you, it simply commits your pending +changes before applying GPT's edits. +This keeps your edits separate from GPT's edits, and +makes sure you never lose your work if GPT makes an inappropriate change. ## GPT-4 vs GPT-3.5