1
0
mirror of synced 2026-01-31 09:01:33 -05:00
Files
docs/data/reusables/pull_requests/rebase_and_merge_summary.md
Philippe Blain e2e3fac554 rebase_and_merge_summary: correct link description to git-scm.com/docs
The text links to the official documentation for `git rebase` at 
https://git-scm.com/docs/git-rebase, but mislabels the link as a chapter 
in the "Pro Git" book.

Fix that.
2021-01-27 15:53:47 -05:00

1.3 KiB

When you select the Rebase and merge option on a pull request on {% data variables.product.product_location %}, all commits from the topic branch (or head branch) are added onto the base branch individually without a merge commit. Pull requests with rebased commits are merged using the fast-forward option.

To rebase and merge pull requests, you must have write permissions in the repository, and the repository must allow rebase merging.

The rebase and merge behavior on {% data variables.product.product_name %} deviates slightly from git rebase. Rebase and merge on {% data variables.product.prodname_dotcom %} will always update the committer information and create new commit SHAs, whereas git rebase outside of {% data variables.product.prodname_dotcom %} does not change the committer information when the rebase happens on top of an ancestor commit. For more information about git rebase, see the official Git documentation.

For a visual representation of git rebase, see The "Git Branching - Rebasing" chapter from the Pro Git book.