From aa3dbac94c67a98371715093b2945f783d642975 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Tue, 18 Jun 2024 11:23:34 -0700 Subject: [PATCH] updated git docs --- website/docs/git.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/website/docs/git.md b/website/docs/git.md index b25418b93..f9c8bb5ad 100644 --- a/website/docs/git.md +++ b/website/docs/git.md @@ -14,14 +14,21 @@ Aider is tightly integrated with git, which makes it easy to: Aider specifically uses git in these ways: - - It asks to create a git repo if you launch it in a directory without one. - - Whenever aider edits a file, it commits those changes with a descriptive commit message. This makes it easy to undo or review aider's changes. - - Aider takes special care before editing 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 aider's edits, and makes sure you never lose your work if aider makes an inappropriate change. +- It asks to create a git repo if you launch it in a directory without one. +- Whenever aider edits a file, it commits those changes with a descriptive commit message. This makes it easy to undo or review aider's changes. +These commits will have "(aider)" appended to their git author and git committer metadata. +- Aider takes special care before editing 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 aider's edits, and makes sure you never lose your work if aider makes an inappropriate change. +These commits will have "(aider)" appended to their git committer metadata. + +## In-chat commands Aider also allows you to use in-chat commands to `/diff` or `/undo` the last change. To do more complex management of your git history, you cat use raw `git` commands, either by using `/git` within the chat, or with standard git tools outside of aider. +## Disabling git integration + While it is not recommended, you can disable aider's use of git in a few ways: - `--no-auto-commits` will stop aider from git committing each of its changes.