Skip to content

Commit

Permalink
Merge pull request #569 from github/email-selection
Browse files Browse the repository at this point in the history
Specify that merge commit email address is only available when creating a merge commit
  • Loading branch information
janiceilene authored Nov 2, 2020
2 parents 815edb4 + eef1219 commit bbfb168
Showing 1 changed file with 7 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,15 @@ If you decide you don't want the changes in a topic branch to be merged to the u

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

{% note %}

**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.

{% endnote %}

6. Click **Confirm merge**, **Confirm squash and merge**, or **Confirm rebase and merge**.
6. Optionally, [delete the branch](/articles/deleting-unused-branches). This keeps the list of branches in your repository tidy.

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)."

{% if currentVersion == "free-pro-team@latest" or currentVersion == "github-ae@latest" or currentVersion ver_gt "enterprise-server@2.21" %}
Expand Down

0 comments on commit bbfb168

Please sign in to comment.