mirror of
https://github.com/Aider-AI/aider.git
synced 2025-05-31 09:44:59 +00:00
Updated HISTORY
This commit is contained in:
parent
e15b0b04d4
commit
968095b36d
2 changed files with 15 additions and 3 deletions
16
docs/faq.md
16
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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue