dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-06 20:54:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

feat: add section on including git history in aider context

Browse source
This commit is contained in:
fry69 2024-09-26 23:03:13 +02:00
parent 162afd0cdd
commit 0e9f384732
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
aider/website/docs/faq.md
View file

@ -106,6 +106,24 @@ The repo map is usually disabled for a good reason.
If you would like to force it on, you can run aider with `--map-tokens 1024`. If you would like to force it on, you can run aider with `--map-tokens 1024`.
## How do I include the git history in the context?
When starting a fresh aider session, you can include recent git history in the chat context. This can be useful for providing the LLM with information about recent changes. To do this:
1. Use the `/run` command with `git diff` to show recent changes:
```
/run git diff HEAD~1
```
This will include the diff of the last commit in the chat history.
2. To include diffs from multiple commits, increase the number after the tilde:
```
/run git diff HEAD~3
```
This will show changes from the last three commits.
Remember, the chat history already includes recent changes made during the current session, so this tip is most useful when starting a new aider session and you want to provide context about recent work.
## How can I run aider locally from source code? ## How can I run aider locally from source code?
To run the project locally, follow these steps: To run the project locally, follow these steps:

18
aider/website/docs/usage/tips.md
View file

@ -71,24 +71,6 @@ and aider will scrape and read it. For example: `Add a submit button like this h
- Use the [`/read` command](commands.html) to read doc files into the chat from anywhere on your filesystem. - Use the [`/read` command](commands.html) to read doc files into the chat from anywhere on your filesystem.
- If you have coding conventions or standing instructions you want aider to follow, consider using a [conventions file](conventions.html). - If you have coding conventions or standing instructions you want aider to follow, consider using a [conventions file](conventions.html).
## Including git history in the context
When starting a fresh aider session, you can include recent git history in the chat context. This can be useful for providing the LLM with information about recent changes. To do this:
1. Use the `/run` command with `git diff` to show recent changes:
```
/run git diff HEAD~1
```
This will include the diff of the last commit in the chat history.
2. To include diffs from multiple commits, increase the number after the tilde:
```
/run git diff HEAD~3
```
This will show changes from the last three commits.
Remember, the chat history already includes recent changes made during the current session, so this tip is most useful when starting a new aider session and you want to provide context about recent work.
## Interrupting & inputting ## Interrupting & inputting
Use Control-C to interrupt aider if it isn't providing a useful response. The partial response remains in the conversation, so you can refer to it when you reply with more information or direction. Use Control-C to interrupt aider if it isn't providing a useful response. The partial response remains in the conversation, so you can refer to it when you reply with more information or direction.