summaryrefslogtreecommitdiff
path: root/doc/onboarding.md
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2016-09-25 13:39:41 -0700
committerRich Trott <rtrott@gmail.com>2016-09-28 17:20:16 -0700
commit676e624eb309855502b83a5900d63c3febc5f8d3 (patch)
treedc0afa207728901271db8ad1bb74ca13a920e5f0 /doc/onboarding.md
parent8cd2306cc3e3ea379c569ecb90f0af2afa6345e3 (diff)
downloadandroid-node-v8-676e624eb309855502b83a5900d63c3febc5f8d3.tar.gz
android-node-v8-676e624eb309855502b83a5900d63c3febc5f8d3.tar.bz2
android-node-v8-676e624eb309855502b83a5900d63c3febc5f8d3.zip
doc: add optional step to onboarding doc
Include information on how to force push to the contributor's own branch so that pull requests show as merged in GitHub interface. PR-URL: https://github.com/nodejs/node/pull/8774 Reviewed-By: Robert Jefe Lindstaedt <robert.lindstaedt@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaƫl Zasso <targos@protonmail.com> Reviewed-By: Johan Bergstrom <bugs@bergstroem.nu> Reviewed-By: Ilkka Myller <ilkka.myller@nodefield.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'doc/onboarding.md')
-rw-r--r--doc/onboarding.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/onboarding.md b/doc/onboarding.md
index 3b0af6b474..72fce01b33 100644
--- a/doc/onboarding.md
+++ b/doc/onboarding.md
@@ -184,6 +184,7 @@ Landing a PR
* This will automatically close the PR when the commit lands in master.
* `Refs: <full-url>`
* Full URL of material that might provide additional useful information or context to someone trying to understand the change set or the thinking behind it.
+* Optional: Force push the amended commit to the branch you used to open the pull request. If your branch is called `bugfix`, then the command would be `git push --force-with-lease origin master:bugfix`. When the pull request is closed, this will cause the pull request to show the purple merged status rather than the red closed status that is usually used for pull requests that weren't merged. Only do this when landing your own contributions.
* `git push upstream master`
* Close the pull request with a "Landed in `<commit hash>`" comment.