Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Specify that merge commit email address is only available when creating a merge commit #569

Merged
merged 4 commits into from
Nov 2, 2020
Merged

Specify that merge commit email address is only available when creating a merge commit #569

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed1b6dc
Add note to merge commit email selector about rebase and squash merges
greysteil Oct 25, 2020
fb5e65a
Merge branch 'main' into email-selection
hubwriter Oct 29, 2020
cd36152
Update content/github/collaborating-with-issues-and-pull-requests/mer…
hubwriter Oct 29, 2020
eef1219
Merge branch 'main' into email-selection
janiceilene Nov 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ...nt/github/collaborating-with-issues-and-pull-requests/merging-a-pull-request.md
View file
Open in desktop
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