Skip to content

Commit 065a07b

Browse files
committed
remove default-merge-squash-commit-message
1 parent 524c9c7 commit 065a07b

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,14 @@ topics:
2424

2525
### Merge message for a squash merge
2626

27-
{% ifversion default-merge-squash-commit-message %}
2827
When you squash and merge, {% data variables.product.prodname_dotcom %} generates a default commit message, which you can edit. Depending on how the repository is configured and the number of commits in the pull request, not including merge commits, this message may include the pull request title, pull request description, or information about the commits.
29-
{% else %}
30-
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.
3128

3229
| Number of commits | Summary | Description |
3330
| ----------------- | ------- | ----------- |
3431
| 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 |
3532
| 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 |
3633

37-
{% endif %}
38-
39-
| Number of commits | Summary | Description |
40-
| ----------------- | ------- | ----------- |
41-
| 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 |
42-
| 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 |
43-
44-
{% ifversion default-merge-squash-commit-message %}
45-
People with maintainer or admin access to a repository can configure their repository's default merge message for all squashed commits to use the pull request title, the pull request title and commit details, or the pull request title and description. For more information, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests).{% endif %}
34+
People with maintainer or admin access to a repository can configure their repository's default merge message for all squashed commits to use the pull request title, the pull request title and commit details, or the pull request title and description. For more information, see [AUTOTITLE](/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests).
4635

4736
### Squashing and merging a long-running branch
4837

content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-merging-for-pull-requests.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ shortTitle: Configure commit merging
1414
{% data reusables.repositories.navigate-to-repo %}
1515
{% data reusables.repositories.sidebar-settings %}
1616
1. Under "Pull Requests", select **Allow merge commits**. This allows contributors to merge a pull request with a full history of commits.
17-
{% ifversion default-merge-squash-commit-message %}
1817
1. Optionally, under **Allow merge commits**, select the dropdown menu, then click the format of the commit message presented to contributors when merging.
1918

2019
The default message includes the pull request number and title. For example, `Merge pull request #123 from patch-1`. You can also choose to use just the pull request title, or the pull request title and description.
21-
{% endif %}
2220

2321
If you select more than one merge method, collaborators can choose which type of merge commit to use when they merge a pull request. {% data reusables.repositories.squash-and-rebase-linear-commit-history %}
2422

content/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-squashing-for-pull-requests.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@ shortTitle: Configure commit squashing
2121
{% data reusables.repositories.sidebar-settings %}
2222
1. On the "General" settings page (which is selected by default), scroll down to the section marked "Pull Requests".
2323
1. Under "Pull Requests", select **Allow squash merging**. This allows contributors to merge a pull request by squashing all commits into a single commit. The default commit message presented to contributors when merging is the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits.
24-
{% ifversion default-merge-squash-commit-message %}
2524
1. Optionally, under **Allow squash merging**, select the dropdown menu, then click the format of the default squash commit message presented to contributors when merging.
2625

2726
The default message uses the commit title and message if the pull request contains only 1 commit, or the pull request title and list of commits if the pull request contains 2 or more commits. You can also choose to use just the pull request title, the pull request title and commit details, or the pull request title and description.
28-
{% endif %}
2927

3028
If you select more than one merge method, collaborators can choose which type of merge commit to use when they merge a pull request. {% data reusables.repositories.squash-and-rebase-linear-commit-history %}
3129

0 commit comments

Comments
 (0)