diff --git a/HISTORY.md b/HISTORY.md index 86f613da7..8ad0eef77 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -15,10 +15,10 @@ - Performance improvements for repo map calculation. - `/tokens` now shows the active model. - Enhanced commit message attribution options: - - New `--attribute-commit-message-author` to prefix commit messages with 'aider: ' if aider authored the changes. + - New `--attribute-commit-message-author` to prefix commit messages with 'aider: ' if aider authored the changes, replaces `--attribute-commit-message`. - New `--attribute-commit-message-committer` to prefix all commit messages with 'aider: '. - These replace the previous `--attribute-commit-message` option. -- Aider wrote 57% of the code since the last release. +- Aider wrote 61% of the code since the last release. ### Aider v0.48.1 diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index 03e4a661a..bc1676096 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -29,7 +29,11 @@ cog.out(text) - Bugfix to keep session cost accurate when using `/ask` and `/help`. - Performance improvements for repo map calculation. - `/tokens` now shows the active model. -- Aider wrote 57% of the code since the last release. +- Enhanced commit message attribution options: + - New `--attribute-commit-message-author` to prefix commit messages with 'aider: ' if aider authored the changes, replaces `--attribute-commit-message`. + - New `--attribute-commit-message-committer` to prefix all commit messages with 'aider: '. + - These replace the previous `--attribute-commit-message` option. +- Aider wrote 61% of the code since the last release. ### Aider v0.48.1 diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml index 8a22224ff..b771f791d 100644 --- a/aider/website/assets/sample.aider.conf.yml +++ b/aider/website/assets/sample.aider.conf.yml @@ -171,7 +171,10 @@ #attribute-committer: true ## Prefix commit messages with 'aider: ' if aider authored the changes (default: False) -#attribute-commit-message: false +#attribute-commit-message-author: false + +## Prefix all commit messages with 'aider: ' (default: False) +#attribute-commit-message-committer: false ## Commit all pending changes with a suitable commit message, then exit #commit: false diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env index 3360112bd..a0f305388 100644 --- a/aider/website/assets/sample.env +++ b/aider/website/assets/sample.env @@ -175,7 +175,10 @@ #AIDER_ATTRIBUTE_COMMITTER=true ## Prefix commit messages with 'aider: ' if aider authored the changes (default: False) -#AIDER_ATTRIBUTE_COMMIT_MESSAGE=false +#AIDER_ATTRIBUTE_COMMIT_MESSAGE_AUTHOR=false + +## Prefix all commit messages with 'aider: ' (default: False) +#AIDER_ATTRIBUTE_COMMIT_MESSAGE_COMMITTER=false ## Commit all pending changes with a suitable commit message, then exit #AIDER_COMMIT=false diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md index be4c17a39..e45b71f54 100644 --- a/aider/website/docs/config/aider_conf.md +++ b/aider/website/docs/config/aider_conf.md @@ -210,7 +210,10 @@ cog.outl("```") #attribute-committer: true ## Prefix commit messages with 'aider: ' if aider authored the changes (default: False) -#attribute-commit-message: false +#attribute-commit-message-author: false + +## Prefix all commit messages with 'aider: ' (default: False) +#attribute-commit-message-committer: false ## Commit all pending changes with a suitable commit message, then exit #commit: false diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md index c5ae2c2ea..380d7cabd 100644 --- a/aider/website/docs/config/dotenv.md +++ b/aider/website/docs/config/dotenv.md @@ -217,7 +217,10 @@ cog.outl("```") #AIDER_ATTRIBUTE_COMMITTER=true ## Prefix commit messages with 'aider: ' if aider authored the changes (default: False) -#AIDER_ATTRIBUTE_COMMIT_MESSAGE=false +#AIDER_ATTRIBUTE_COMMIT_MESSAGE_AUTHOR=false + +## Prefix all commit messages with 'aider: ' (default: False) +#AIDER_ATTRIBUTE_COMMIT_MESSAGE_COMMITTER=false ## Commit all pending changes with a suitable commit message, then exit #AIDER_COMMIT=false diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md index e946816dc..a95f060ba 100644 --- a/aider/website/docs/config/options.md +++ b/aider/website/docs/config/options.md @@ -47,7 +47,8 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model] [--dirty-commits | --no-dirty-commits] [--attribute-author | --no-attribute-author] [--attribute-committer | --no-attribute-committer] - [--attribute-commit-message | --no-attribute-commit-message] + [--attribute-commit-message-author | --no-attribute-commit-message-author] + [--attribute-commit-message-committer | --no-attribute-commit-message-committer] [--commit] [--commit-prompt] [--dry-run | --no-dry-run] [--lint] [--lint-cmd] [--auto-lint | --no-auto-lint] [--test-cmd] [--auto-test | --no-auto-test] [--test] @@ -331,13 +332,21 @@ Aliases: - `--attribute-committer` - `--no-attribute-committer` -### `--attribute-commit-message` +### `--attribute-commit-message-author` Prefix commit messages with 'aider: ' if aider authored the changes (default: False) Default: False -Environment variable: `AIDER_ATTRIBUTE_COMMIT_MESSAGE` +Environment variable: `AIDER_ATTRIBUTE_COMMIT_MESSAGE_AUTHOR` Aliases: - - `--attribute-commit-message` - - `--no-attribute-commit-message` + - `--attribute-commit-message-author` + - `--no-attribute-commit-message-author` + +### `--attribute-commit-message-committer` +Prefix all commit messages with 'aider: ' (default: False) +Default: False +Environment variable: `AIDER_ATTRIBUTE_COMMIT_MESSAGE_COMMITTER` +Aliases: + - `--attribute-commit-message-committer` + - `--no-attribute-commit-message-committer` ### `--commit` Commit all pending changes with a suitable commit message, then exit