From 792192347a62015b789ce035039867b0d5b7c2f3 Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Tue, 3 Apr 2018 11:39:56 -0700
Subject: [PATCH 1/2] doc: add instructions to update local git config

this code change updates pull-requests.md to instruct developers to
update their local git config instead of global. This way their global
git config won't be overwritten if they use different email ID for work
or personal or non-Github projects
---
 doc/guides/contributing/pull-requests.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md
index 9220ab4e8e6396..8b59b94145713a 100644
--- a/doc/guides/contributing/pull-requests.md
+++ b/doc/guides/contributing/pull-requests.md
@@ -62,18 +62,6 @@ These are detailed in the [Building guide][].
 Once you have `git` and are sure you have all of the necessary dependencies,
 it's time to create a fork.
 
-Before getting started, it is recommended to configure `git` so that it knows
-who you are:
-
-```text
-$ git config --global user.name "J. Random User"
-$ git config --global user.email "j.random.user@example.com"
-```
-Please make sure this local email is also added to your
-[GitHub email list](https://github.com/settings/emails) so that your commits
-will be properly associated with your account and you will be promoted
-to Contributor once your first commit is landed.
-
 ### Step 1: Fork
 
 Fork the project [on GitHub](https://github.com/nodejs/node) and clone your fork
@@ -86,6 +74,18 @@ $ git remote add upstream https://github.com/nodejs/node.git
 $ git fetch upstream
 ```
 
+It is recommended to configure `git` so that it knows
+who you are:
+
+```text
+$ git config user.name "J. Random User"
+$ git config user.email "j.random.user@example.com"
+```
+Please make sure this local email is also added to your
+[GitHub email list](https://github.com/settings/emails) so that your commits
+will be properly associated with your account and you will be promoted
+to Contributor once your first commit is landed.
+
 ### Step 2: Branch
 
 As a best practice to keep your development environment as organized as

From 4cfb5ca04dac187f85fc8ec51b8fe6f0e283016c Mon Sep 17 00:00:00 2001
From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com>
Date: Wed, 4 Apr 2018 07:56:11 -0700
Subject: [PATCH 2/2] fixup: comments from @lpinca

---
 doc/guides/contributing/pull-requests.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/guides/contributing/pull-requests.md b/doc/guides/contributing/pull-requests.md
index 8b59b94145713a..c371c82b7474e2 100644
--- a/doc/guides/contributing/pull-requests.md
+++ b/doc/guides/contributing/pull-requests.md
@@ -74,8 +74,7 @@ $ git remote add upstream https://github.com/nodejs/node.git
 $ git fetch upstream
 ```
 
-It is recommended to configure `git` so that it knows
-who you are:
+It is recommended to configure `git` so that it knows who you are:
 
 ```text
 $ git config user.name "J. Random User"