Skip to content

Commit ed1b6dc

Browse files
committed
Add note to merge commit email selector about rebase and squash merges
1 parent 1f7580a commit ed1b6dc

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

content/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,15 @@ If you decide you don't want the changes in a topic branch to be merged to the u
4545

4646
{% data reusables.files.choose-commit-email %}
4747

48+
{% note %}
49+
50+
**Note:** The email selector is not available for rebase merges, which do not create a merge commit, or for squash merges, which credit the user who created the pull request as the author of the squashed commit.
51+
52+
{% endnote %}
53+
4854
6. Click **Confirm merge**, **Confirm squash and merge**, or **Confirm rebase and merge**.
4955
6. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy.
50-
56+
5157
The repository may be configured so that the head branch for a pull request is automatically deleted when you merge a pull request. For more information, see "[Managing the automatic deletion of branches](/github/administering-a-repository/managing-the-automatic-deletion-of-branches)."
5258

5359
{% if currentVersion == "free-pro-team@latest" or currentVersion ver_gt "[email protected]" %}

0 commit comments

Comments
 (0)