diff --git a/HISTORY.md b/HISTORY.md index 332b1de81..c5269b92f 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -3,7 +3,7 @@ ### main branch -- [Commit message](http://aider.chat/docs/git.html#commit-messages) improvements: +- [Commit message](https://aider.chat/docs/git.html#commit-messages) improvements: - Added Conventional Commits guidelines to commit message prompt. - Added `--commit-prompt` to customize the commit message prompt. - Added strong model as a fallback for commit messages (and chat summaries). diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index 171d8688b..5fded7ab8 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -16,9 +16,9 @@ cog.out(text) # Release history -## main branch +### main branch -- [Commit message](http://aider.chat/docs/git.html#commit-messages) improvements: +- [Commit message](https://aider.chat/docs/git.html#commit-messages) improvements: - Added Conventional Commits guidelines to commit message prompt. - Added `--commit-prompt` to customize the commit message prompt. - Added strong model as a fallback for commit messages (and chat summaries). @@ -37,7 +37,7 @@ cog.out(text) - Bugfix in `/run` add to chat approval logic. - Aider wrote 58% of the code in this release. -## Aider v0.46.1 +### Aider v0.46.1 - Downgraded stray numpy dependency back to 1.26.4. diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml index 481d3f600..54f2eb5f2 100644 --- a/aider/website/assets/sample.aider.conf.yml +++ b/aider/website/assets/sample.aider.conf.yml @@ -17,9 +17,6 @@ ####### # Main: -## specify a file to edit (can be used multiple times) -#file: - ## Specify the OpenAI API key #openai-api-key: @@ -170,6 +167,9 @@ ## Prefix commit messages with 'aider: ' (default: False) #attribute-commit-message: false +## Commit all pending changes with a suitable commit message, then exit +#commit: false + ## Specify a custom prompt for generating commit messages #commit-prompt: @@ -179,9 +179,6 @@ ######################## # Fixing and committing: -## Commit all pending changes with a suitable commit message, then exit -#commit: false - ## Lint and fix provided files, or dirty files if none provided #lint: false @@ -203,6 +200,9 @@ ################# # Other Settings: +## specify a file to edit (can be used multiple times) +#file: + ## Use VI editing mode in the terminal (default: False) #vim: false diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env index 592888dd8..e1d18f307 100644 --- a/aider/website/assets/sample.env +++ b/aider/website/assets/sample.env @@ -21,9 +21,6 @@ ####### # Main: -## specify a file to edit (can be used multiple times) -#AIDER_FILE= - ## Specify the OpenAI API key #OPENAI_API_KEY= @@ -174,6 +171,9 @@ ## Prefix commit messages with 'aider: ' (default: False) #AIDER_ATTRIBUTE_COMMIT_MESSAGE=false +## Commit all pending changes with a suitable commit message, then exit +#AIDER_COMMIT=false + ## Specify a custom prompt for generating commit messages #AIDER_COMMIT_PROMPT= @@ -183,9 +183,6 @@ ######################## # Fixing and committing: -## Commit all pending changes with a suitable commit message, then exit -#AIDER_COMMIT=false - ## Lint and fix provided files, or dirty files if none provided #AIDER_LINT=false @@ -207,6 +204,9 @@ ################# # Other Settings: +## specify a file to edit (can be used multiple times) +#AIDER_FILE= + ## Use VI editing mode in the terminal (default: False) #AIDER_VIM=false diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md index 1038c63f8..12596dc35 100644 --- a/aider/website/docs/config/aider_conf.md +++ b/aider/website/docs/config/aider_conf.md @@ -56,9 +56,6 @@ cog.outl("```") ####### # Main: -## specify a file to edit (can be used multiple times) -#file: - ## Specify the OpenAI API key #openai-api-key: @@ -209,6 +206,9 @@ cog.outl("```") ## Prefix commit messages with 'aider: ' (default: False) #attribute-commit-message: false +## Commit all pending changes with a suitable commit message, then exit +#commit: false + ## Specify a custom prompt for generating commit messages #commit-prompt: @@ -218,9 +218,6 @@ cog.outl("```") ######################## # Fixing and committing: -## Commit all pending changes with a suitable commit message, then exit -#commit: false - ## Lint and fix provided files, or dirty files if none provided #lint: false @@ -242,6 +239,9 @@ cog.outl("```") ################# # Other Settings: +## specify a file to edit (can be used multiple times) +#file: + ## Use VI editing mode in the terminal (default: False) #vim: false diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md index a5936bd23..42bdbb4ac 100644 --- a/aider/website/docs/config/dotenv.md +++ b/aider/website/docs/config/dotenv.md @@ -63,9 +63,6 @@ cog.outl("```") ####### # Main: -## specify a file to edit (can be used multiple times) -#AIDER_FILE= - ## Specify the OpenAI API key #OPENAI_API_KEY= @@ -216,6 +213,9 @@ cog.outl("```") ## Prefix commit messages with 'aider: ' (default: False) #AIDER_ATTRIBUTE_COMMIT_MESSAGE=false +## Commit all pending changes with a suitable commit message, then exit +#AIDER_COMMIT=false + ## Specify a custom prompt for generating commit messages #AIDER_COMMIT_PROMPT= @@ -225,9 +225,6 @@ cog.outl("```") ######################## # Fixing and committing: -## Commit all pending changes with a suitable commit message, then exit -#AIDER_COMMIT=false - ## Lint and fix provided files, or dirty files if none provided #AIDER_LINT=false @@ -249,6 +246,9 @@ cog.outl("```") ################# # Other Settings: +## specify a file to edit (can be used multiple times) +#AIDER_FILE= + ## Use VI editing mode in the terminal (default: False) #AIDER_VIM=false diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md index e351b250d..785a7cdb5 100644 --- a/aider/website/docs/config/options.md +++ b/aider/website/docs/config/options.md @@ -25,8 +25,8 @@ from aider.args import get_md_help cog.out(get_md_help()) ]]]--> ``` -usage: aider [-h] [--file] [--openai-api-key] [--anthropic-api-key] - [--model] [--opus] [--sonnet] [--4] [--4o] [--4-turbo] +usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model] + [--opus] [--sonnet] [--4] [--4o] [--4-turbo] [--35turbo] [--models] [--openai-api-base] [--openai-api-type] [--openai-api-version] [--openai-api-deployment-id] [--openai-organization-id] @@ -48,10 +48,10 @@ usage: aider [-h] [--file] [--openai-api-key] [--anthropic-api-key] [--attribute-author | --no-attribute-author] [--attribute-committer | --no-attribute-committer] [--attribute-commit-message | --no-attribute-commit-message] - [--commit-prompt] [--dry-run | --no-dry-run] [--commit] + [--commit] [--commit-prompt] [--dry-run | --no-dry-run] [--lint] [--lint-cmd] [--auto-lint | --no-auto-lint] [--test-cmd] [--auto-test | --no-auto-test] [--test] - [--vim] [--voice-language] [--version] + [--file] [--vim] [--voice-language] [--version] [--just-check-update] [--check-update | --no-check-update] [--apply] [--yes] [-v] [--show-repo-map] [--show-prompts] [--exit] @@ -69,10 +69,6 @@ Aliases: ## Main: -### `--file FILE` -specify a file to edit (can be used multiple times) -Environment variable: `AIDER_FILE` - ### `--openai-api-key OPENAI_API_KEY` Specify the OpenAI API key Environment variable: `OPENAI_API_KEY` @@ -335,6 +331,11 @@ Aliases: - `--attribute-commit-message` - `--no-attribute-commit-message` +### `--commit` +Commit all pending changes with a suitable commit message, then exit +Default: False +Environment variable: `AIDER_COMMIT` + ### `--commit-prompt PROMPT` Specify a custom prompt for generating commit messages Environment variable: `AIDER_COMMIT_PROMPT` @@ -349,11 +350,6 @@ Aliases: ## Fixing and committing: -### `--commit` -Commit all pending changes with a suitable commit message, then exit -Default: False -Environment variable: `AIDER_COMMIT` - ### `--lint` Lint and fix provided files, or dirty files if none provided Default: False @@ -392,6 +388,10 @@ Environment variable: `AIDER_TEST` ## Other Settings: +### `--file FILE` +specify a file to edit (can be used multiple times) +Environment variable: `AIDER_FILE` + ### `--vim` Use VI editing mode in the terminal (default: False) Default: False