diff options
| author | Warner Losh <imp@FreeBSD.org> | 2021-06-03 13:55:34 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2021-06-03 13:55:34 +0000 |
| commit | e22642d10ef896da9a08ac07a264f290b28b934c (patch) | |
| tree | f54f0ac89aba3312e09b6da4fd4fee1ac7676440 | |
| parent | cd2b40e5b8d5f4ca05ab1ce43a736d406f051119 (diff) | |
committers-guide: pull request landing tweaks.
Clarify that only closing the pull request resuires a GitHub
account. All the other steps can proceed without one.
Also, include --push-option=confirm-author in the push because pull
requests will have a different author than the committer and this
instructs the src pre-commit hooks to allow the commit through.
Sponsored by: Netflix
| -rw-r--r-- | documentation/content/en/articles/committers-guide/_index.adoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/content/en/articles/committers-guide/_index.adoc b/documentation/content/en/articles/committers-guide/_index.adoc index f3c63a4943..1767095908 100644 --- a/documentation/content/en/articles/committers-guide/_index.adoc +++ b/documentation/content/en/articles/committers-guide/_index.adoc @@ -2243,7 +2243,7 @@ When adjusting the message, add `Pull Request: https://github.com/freebsd-src/pu % git checkout main % git merge --ff-only staging <test again if needed> -% git push freebsd +% git push freebsd --push-option=confirm-author .... [.procedure] @@ -2261,7 +2261,7 @@ For complicated pull requests that have multiple commits with conflicts, follow This will also work when bringing branches developed elsewhere into the local tree for committing. ==== Once finished with the pull request, close it using GitHub's web interface. -If the changes are fetched with https, this last step is the only one requiring a GitHub account. +It is worth noting that if your `github` origin uses `https://`, the only step you'll need a GitHub account for is closing the pull request. [[vcs-history]] == Version Control History |