Skip to content

Commit 52202bd

Browse files
authored
Merge pull request #42361 from github/repo-sync
Repo sync
2 parents 230058d + fbccb77 commit 52202bd

File tree

21 files changed

+346
-62
lines changed

21 files changed

+346
-62
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# ---------------------------------------------------------------
99
# To update the sha:
1010
# https://github.com/github/gh-base-image/pkgs/container/gh-base-image%2Fgh-base-noble
11-
FROM ghcr.io/github/gh-base-image/gh-base-noble:20251217-105955-g05726ec4c AS base
11+
FROM ghcr.io/github/gh-base-image/gh-base-noble:20260109-173439-g06c82aab1 AS base
1212

1313
# Install curl for Node install and determining the early access branch
1414
# Install git for cloning docs-early-access & translations repos

content/account-and-profile/concepts/account-management.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,26 @@ redirect_from:
1313
- /account-and-profile/concepts/personal-account-management
1414
---
1515

16+
{% ifversion ghes < 3.21 %}
1617
## About converting your personal account
1718

1819
Converting a personal account into an organization allows you move to a shared account where a large number of people can collaborate across many projects at once. Converting your account:
1920
* Preserves the repositories as they are without the need to transfer them to another account manually
2021
* Automatically invites collaborators to teams with permissions equivalent to what they had before
21-
{%- ifversion fpt or ghec %}
22-
* For personal accounts on {% data variables.product.prodname_pro %}, automatically transitions billing to [the paid {% data variables.product.prodname_team %}](/billing/managing-the-plan-for-your-github-account/about-billing-for-plans) without the need to re-enter payment information, adjust your billing cycle, or double pay at any time
23-
{%- endif %}
2422

2523
When you convert a personal account into an organization, we'll add collaborators on repositories that belong to the account to the new organization as outside collaborators. You can then invite outside collaborators to become members of your new organization if you wish. For more information, see [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/roles-in-an-organization#outside-collaborators).
2624

2725
To convert your personal account into an organization, see [AUTOTITLE](/account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization).
2826

27+
{% else %}
28+
29+
## About moving your work to an organization
30+
31+
You can move repositories and projects from your personal account to an organization while keeping your personal account intact. This enables team collaboration with granular permissions across your existing work.
32+
33+
For more information, see [AUTOTITLE](/account-and-profile/how-tos/account-management/moving-your-work-to-an-organization).
34+
{% endif %}
35+
2936
## About deletion of your personal account
3037

3138
Deleting your personal account removes all repositories, forks of private repositories, wikis, issues, pull requests, and pages owned by your account. {% ifversion fpt or ghec %}Issues and pull requests you've created and comments you've made in repositories owned by other users will not be deleted. Your resources and comments will become associated with the [ghost user](https://github.com/ghost).{% else %}Issues and pull requests you've created and comments you've made in repositories owned by other users will not be deleted.{% endif %}

content/account-and-profile/how-tos/account-management/converting-a-user-into-an-organization.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ redirect_from:
1212
- /account-and-profile/how-tos/setting-up-and-managing-your-personal-account-on-github/managing-your-personal-account/converting-a-user-into-an-organization
1313
intro: You can convert your personal account into an organization. This allows more granular permissions for repositories that belong to the organization.
1414
versions:
15-
fpt: '*'
16-
ghes: '*'
17-
ghec: '*'
15+
ghes: '<3.21'
1816
topics:
1917
- Accounts
2018
shortTitle: Convert your account
@@ -25,9 +23,7 @@ contentType: how-tos
2523

2624
The personal account you want to convert cannot be a member of any organizations. If the personal account you want to convert is a member of an organization, you must leave the organization before you can convert the account.
2725

28-
{% ifversion ghes %}
29-
You may not be able to convert a personal account into an organization, if an enterprise owner has set a policy at the enterprise level. See, [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations).
30-
{% endif %}
26+
You may not be able to convert a personal account into an organization if an enterprise owner has set a policy at the enterprise level. See, [AUTOTITLE](/admin/managing-accounts-and-repositories/managing-organizations-in-your-enterprise/preventing-users-from-creating-organizations).
3127

3228
## Keep your personal account and create a new organization manually
3329

@@ -56,7 +52,4 @@ To convert your personal account into an organization, follow these steps:
5652

5753
* [AUTOTITLE](/account-and-profile/reference/personal-account-reference#side-effects-of-converting-an-account-to-an-organization)
5854
* [AUTOTITLE](/organizations/organizing-members-into-teams)
59-
{% ifversion fpt or ghec %}
60-
* [AUTOTITLE](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)
61-
{% endif %}
6255
* [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-your-membership-in-organizations/accessing-an-organization)

content/account-and-profile/how-tos/account-management/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Managing your personal account
3-
intro: You can manage your personal account on {% data variables.product.github %}. For example, you can {% ifversion fpt or ghec %}manage multiple accounts, {% endif %}convert an account to an organization, or delete an account.
3+
intro: You can manage your personal account on {% data variables.product.github %}. For example, you can change your username, {% ifversion fpt or ghec %}manage multiple accounts, {% endif %}{% ifversion ghes < 3.21 %}convert an account to an organization, {% else %}move your work to an organization, {% endif %}or delete an account.
44
shortTitle: Personal account management
55
versions:
66
fpt: '*'
@@ -12,6 +12,7 @@ children:
1212
- /managing-multiple-accounts
1313
- /merging-multiple-personal-accounts
1414
- /changing-your-username
15+
- /moving-your-work-to-an-organization
1516
- /converting-a-user-into-an-organization
1617
- /unlinking-your-email-address-from-a-locked-account
1718
- /deleting-your-personal-account
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
title: Moving your work to an organization
3+
intro: You can transfer repositories and projects from your personal account to a new or existing organization through your account settings.
4+
versions:
5+
fpt: '*'
6+
ghes: '>= 3.21'
7+
ghec: '*'
8+
topics:
9+
- Organizations
10+
- Teams
11+
shortTitle: Move work to organization
12+
---
13+
14+
## Keeping your username for the organization
15+
16+
If you want your new organization to use your current personal account username, you'll need to rename your personal account first:
17+
18+
1. Change your personal account username to something new. For more information, see [AUTOTITLE](/account-and-profile/setting-up-and-managing-your-personal-account-on-github/managing-personal-account-settings/changing-your-github-username).
19+
1. Create an organization using your original username, then follow the steps below to move your work.
20+
21+
## Moving your work to an organization
22+
23+
{% data reusables.user-settings.access_settings %}
24+
{% data reusables.user-settings.organizations %}
25+
1. Under the "Move to an organization" section, click **Move work to an organization**.
26+
1. Follow the prompts to transfer any of your repositories and projects to a new or existing organization. {% ifversion fpt or ghec %}For more information about the plans available for your team, see [AUTOTITLE](/get-started/learning-about-github/githubs-plans).{% endif %}
27+
1. Once done assigning your work to its new location, click **Move to an organization**, then click **Go to your organization**.
28+
29+
## Further reading
30+
31+
- [AUTOTITLE](/organizations/managing-membership-in-your-organization/inviting-users-to-join-your-organization)
32+
- [AUTOTITLE](/organizations/managing-peoples-access-to-your-organization-with-roles/maintaining-ownership-continuity-for-your-organization)

content/copilot/concepts/prompting/response-customization.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ You can use three types of repository custom instructions in {% data variables.p
4848

4949
{% data reusables.copilot.custom-instructions-about %}
5050

51-
{% data reusables.copilot.repository-custom-instructions-support %}
52-
5351
## About organization custom instructions
5452

5553
{% data reusables.copilot.custom-instructions-org-support %}
@@ -71,7 +69,7 @@ The following list shows the complete order of precedence, with instructions hig
7169

7270
* **Personal** instructions
7371
* **Repository** custom instructions:
74-
* **Path-specific** instructions in any applicable `.github/instructions/**/NAME.instructions.md` file
72+
* **Path-specific** instructions in any applicable `.github/instructions/**/*.instructions.md` file
7573
* **Repository-wide** instructions in the `.github/copilot-instructions.md` file
7674
* **Agent** instructions (for example, in an `AGENTS.md` file)
7775
* **Organization** custom instructions
@@ -132,8 +130,6 @@ You can use three types of repository custom instructions in {% data variables.p
132130

133131
{% data reusables.copilot.custom-instructions-about %}
134132

135-
{% data reusables.copilot.repository-custom-instructions-support %}
136-
137133
## About prompt files
138134

139135
> [!NOTE] Prompt files are {% data variables.release-phases.public_preview %} and subject to change.
@@ -225,16 +221,14 @@ You can use two types of repository custom instructions in {% data variables.pro
225221

226222
* **Path-specific custom instructions**, which apply to requests made in the context of files that match a specified path.
227223

228-
These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository.
224+
These are specified in one or more `NAME.instructions.md` files within or below the `.github/instructions` directory in the repository.
229225

230226
By using path-specific instructions you can avoid overloading your repository-wide instructions with information that only applies to files of certain types, or in certain directories.
231227

232-
See the table below for details of support for each of these types of repository custom instructions across different {% data variables.product.prodname_copilot_short %} features.
228+
For details of support for each of these types of repository custom instructions across different {% data variables.product.prodname_copilot_short %} features, see [AUTOTITLE](/copilot/reference/custom-instructions-support).
233229

234230
For a curated collection of examples, see [AUTOTITLE](/copilot/tutorials/customization-library/custom-instructions).
235231

236-
{% data reusables.copilot.repository-custom-instructions-support %}
237-
238232
## About prompt files
239233

240234
Prompt files let you build and share reusable prompt instructions with additional context. A prompt file is a Markdown file, stored in your workspace, that mimics the existing format of writing prompts in {% data variables.copilot.copilot_chat_short %} (for example, `Rewrite #file:x.ts`). This allows blending natural language instructions, additional context, and even linking to other prompt files as dependencies.
@@ -317,7 +311,9 @@ While custom instructions help to add codebase-wide context to each AI workflow,
317311

318312
In JetBrains IDEs, repository custom instructions consist of a single file, `.github/copilot-instructions.md`, that you create in a repository. The instructions you add to the file should be short, self-contained statements that add context or relevant information to supplement a {% data variables.product.prodname_copilot_short %} prompt.
319313

320-
{% data reusables.copilot.repository-custom-instructions-support %}
314+
### Support for repository custom instructions
315+
316+
For details of which types of custom instructions are supported across various environments, see [AUTOTITLE](/copilot/reference/custom-instructions-support).
321317

322318
### Use cases for custom instructions
323319

@@ -411,7 +407,9 @@ For a curated collection of examples, see [AUTOTITLE](/copilot/tutorials/customi
411407

412408
In Xcode, repository custom instructions consist of a single file, `.github/copilot-instructions.md`, that you create in a repository. The instructions you add to the file should be short, self-contained statements that add context or relevant information to supplement a {% data variables.product.prodname_copilot_short %} prompt.
413409

414-
{% data reusables.copilot.repository-custom-instructions-support %}
410+
### Support for repository custom instructions
411+
412+
For details of which types of custom instructions are supported across various environments, see [AUTOTITLE](/copilot/reference/custom-instructions-support).
415413

416414
### Use cases for custom instructions
417415

content/copilot/how-tos/configure-custom-instructions/add-repository-instructions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ Once saved, these instructions will apply to the current project in Eclipse that
217217

218218
* **Path-specific custom instructions**, which apply to requests made in the context of files that match a specified path.
219219

220-
These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions).
220+
These are specified in one or more `NAME.instructions.md` files within or below the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions).
221221

222222
If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used. You should avoid potential conflicts between instructions as {% data variables.product.prodname_copilot_short %}'s choice between conflicting instructions is non-deterministic.
223223

@@ -253,7 +253,7 @@ Once saved, these instructions will apply to the current project in Eclipse that
253253

254254
* **Path-specific custom instructions**, which apply to requests made in the context of files that match a specified path.
255255

256-
These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-1).
256+
These are specified in one or more `NAME.instructions.md` files within or below the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-1).
257257

258258
If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used.
259259

@@ -290,7 +290,7 @@ Once saved, these instructions will apply to the current project in Eclipse that
290290

291291
* **Path-specific custom instructions**, which apply to requests made in the context of files that match a specified path.
292292

293-
These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-2).
293+
These are specified in one or more `NAME.instructions.md` files within or below the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-2).
294294

295295
If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used.
296296

@@ -320,7 +320,7 @@ Once saved, these instructions will apply to the current project in Eclipse that
320320

321321
* **Path-specific custom instructions** apply to requests made in the context of files that match a specified path.
322322

323-
These are specified in one or more `NAME.instructions.md` files within the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-2).
323+
These are specified in one or more `NAME.instructions.md` files within or below the `.github/instructions` directory in the repository. See [Creating path-specific custom instructions](#creating-path-specific-custom-instructions-2).
324324

325325
If the path you specify matches a file that {% data variables.product.prodname_copilot_short %} is working on, and a repository-wide custom instructions file also exists, then the instructions from both files are used.
326326

content/copilot/how-tos/use-copilot-agents/use-copilot-cli.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ topics:
1111
- Copilot
1212
- CLI
1313
contentType: how-tos
14-
category:
14+
category:
1515
- Author and optimize with Copilot
1616
---
1717

@@ -171,7 +171,7 @@ You can enhance {% data variables.product.prodname_copilot_short %}’s performa
171171
{% data variables.copilot.copilot_cli_short %} supports:
172172

173173
* Repository-wide instructions in the `.github/copilot-instructions.md` file.
174-
* Path-specific instructions files: `.github/copilot-instructions/**/*.instructions.md`.
174+
* Path-specific instructions files: `.github/instructions/**/*.instructions.md`.
175175
* Agent files such as `AGENTS.md`.
176176

177177
For more information, see [AUTOTITLE](/copilot/how-tos/configure-custom-instructions/add-repository-instructions).
@@ -201,11 +201,11 @@ In the case of naming conflicts, a system-level agent overrides a repository-lev
201201
* Calling out to {% data variables.copilot.copilot_custom_agent_short %} directly in a prompt:
202202

203203
```shell
204-
Use the refactoring agent to refactor this code block
204+
Use the refactoring agent to refactor this code block
205205
```
206206

207207
{% data variables.product.prodname_copilot_short %} will automatically infer the agent you want to use.
208-
208+
209209
* Specifying the {% data variables.copilot.copilot_custom_agent_short %} you want to use with the command-line option. For example:
210210

211211
```shell

0 commit comments

Comments
 (0)