Skip to content

Commit 871e51f

Browse files
authored
Merge pull request #17977 from github/repo-sync
repo sync
2 parents 9dc8de6 + f2de354 commit 871e51f

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

content/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/about-pull-request-merges.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@ topics:
2323

2424
### Merge message for a squash merge
2525

26-
When you squash and merge, {% data variables.product.prodname_dotcom %} generates a commit message which you can change if you want to. The message default depends on whether the pull request contains multiple commits or just one. We do not include merge commits when we count the total number of commits.
26+
When you squash and merge, {% data variables.product.prodname_dotcom %} generates a default commit message, which you can edit. The default message depends on the number of commits in the pull request, not including merge commits.
2727

2828
Number of commits | Summary | Description |
2929
----------------- | ------- | ----------- |
3030
One commit | The title of the commit message for the single commit, followed by the pull request number | The body text of the commit message for the single commit
3131
More than one commit | The pull request title, followed by the pull request number | A list of the commit messages for all of the squashed commits, in date order
3232

33+
People with admin access to a repository can configure the repository to use the title of the pull request as the default merge message for all squashed commits. For more information, see "[Configure commit squashing](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests)".
34+
3335
### Squashing and merging a long-running branch
3436

3537
If you plan to continue work on the [head branch](/github/getting-started-with-github/github-glossary#head-branch) of a pull request after the pull request is merged, we recommend you don't squash and merge the pull request.

0 commit comments

Comments
 (0)