Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ When resolving conflicts, {% data variables.copilot.copilot_cli_short %} needs t

To set a default merge strategy so that you are not prompted each time, add the `mergeStrategy` setting to your configuration file. You can set this in your personal user settings for {% data variables.product.prodname_copilot_short %}, or in the repository settings.

* **User settings**: Add `"mergeStrategy": "rebase"` or `"mergeStrategy": "merge"` to your user-level configuration file (typically `~/.copilot/config.json`).
* **User settings**: Add `"mergeStrategy": "rebase"` or `"mergeStrategy": "merge"` to your user-level configuration file (typically `~/.copilot/settings.json`).
* **Repository settings**: Add the same setting to `.github/copilot/settings.json` in your repository root.

## Fixing CI failures
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ By default, the CLI stores your OAuth token in your operating system's keychain
| Windows | Credential Manager |
| Linux | libsecret (GNOME Keyring, KWallet) |

If the system keychain is unavailable—for example, on a headless Linux server without `libsecret` installed—the CLI prompts you to store the token in a plaintext configuration file at `~/.copilot/config.json`.
If the system keychain is unavailable—for example, on a headless Linux server without `libsecret` installed—the CLI prompts you to store the token in a plaintext configuration file at `~/.copilot/settings.json`.

When you run a command, {% data variables.copilot.copilot_cli_short %} checks for credentials in the following order:

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ If you choose to trust the directory for future sessions, the trusted directory

You can edit the list of permanently trusted directories.

1. Open the CLI’s `config.json` file. By default, it’s stored in a `.copilot` folder under your home directory:
1. Open the CLI’s `settings.json` file. By default, it’s stored in a `.copilot` folder under your home directory:

* **macOS/Linux**: `~/.copilot/config.json`
* **Windows**: `$HOME\.copilot\config.json`
* **macOS/Linux**: `~/.copilot/settings.json`
* **Windows**: `$HOME\.copilot\settings.json`

You can change the config location by setting the `COPILOT_HOME` environment variable.

Expand Down
2 changes: 1 addition & 1 deletion content/copilot/how-tos/copilot-cli/steer-remotely.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Details for accessing the session remotely are displayed when the interactive se

### Configuring remote access to always be enabled

If you always want your interactive CLI sessions to be remotely accessible, add the following to your {% data variables.product.prodname_copilot_short %} configuration file (typically located at `~/.copilot/config.json`):
If you always want your interactive CLI sessions to be remotely accessible, add the following to your {% data variables.product.prodname_copilot_short %} configuration file (typically located at `~/.copilot/settings.json`):

```json copy
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ For additional information use one of the following commands in your terminal:

`copilot help config`

You can adjust the configuration settings by editing the `config.json` file, which is located, by default, in the `~/.copilot` directory. This location can be changed by setting the `COPILOT_HOME` environment variable.
You can adjust the configuration settings by editing the `settings.json` file, which is located, by default, in the `~/.copilot` directory. This location can be changed by setting the `COPILOT_HOME` environment variable.

* **Environment variables** that affect {% data variables.copilot.copilot_cli_short %}:

Expand Down
2 changes: 1 addition & 1 deletion content/copilot/reference/ai-models/model-comparison.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ These models are designed for tasks that require step-by-step reasoning, complex
| Model | Why it's a good fit |
|-------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------|
| {% data variables.copilot.copilot_gpt_5_mini %} | Delivers deep reasoning and debugging with faster responses and lower resource usage than GPT-5. Ideal for interactive sessions and step-by-step code analysis. |
| {% data variables.copilot.copilot_gpt_54 %} | Great at complex reasoning, code analysis, and technical decision-making. |
| {% data variables.copilot.copilot_gpt_55 %} | Great at complex reasoning, code analysis, and technical decision-making. |
| {% data variables.copilot.copilot_claude_sonnet_46 %} | Improves on Sonnet 4.5 with more reliable completions and smarter reasoning under pressure. |
| {% data variables.copilot.copilot_claude_opus_47 %} | Anthropic’s most powerful model. Improves on {% data variables.copilot.copilot_claude_opus_46 %}. |
| {% data variables.copilot.copilot_gemini_31_pro %} | Advanced reasoning across long contexts and scientific or technical analysis. |
Expand Down
3 changes: 3 additions & 0 deletions content/copilot/reference/ai-models/model-hosting.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ contentType: reference

## OpenAI models

{% data reusables.copilot.gpt-55-promo-period %}

Used for:

* {% data variables.copilot.copilot_gpt_41 %}
Expand All @@ -26,6 +28,7 @@ Used for:
* {% data variables.copilot.copilot_gpt_54 %}
* {% data variables.copilot.copilot_gpt_54_mini %}
* {% data variables.copilot.copilot_gpt_54_nano %}
* {% data variables.copilot.copilot_gpt_55 %}

These models are hosted by OpenAI and {% data variables.product.github %}'s Azure infrastructure.

Expand Down
2 changes: 2 additions & 0 deletions content/copilot/reference/ai-models/supported-models.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ The following table shows which AI models are available in each {% data variable

{% data reusables.copilot.opus-47-promo-period %}

{% data reusables.copilot.gpt-55-promo-period %}

Each model has a premium request multiplier, based on its complexity and resource usage. If you are on a paid {% data variables.product.prodname_copilot_short %} plan, your premium request allowance is deducted according to this multiplier.

For more information about premium requests, see [AUTOTITLE](/copilot/managing-copilot/monitoring-usage-and-entitlements/about-premium-requests).
Expand Down
Loading