From 6b0eb884f9f2856d8c75671eb0e576c23288ab15 Mon Sep 17 00:00:00 2001 From: Daniel Bensoussan Date: Fri, 8 Dec 2017 16:18:07 +0100 Subject: doc: reword gitworkflows.txt for neutrality Change 'he' to 'them' to be more neutral in "gitworkflows.txt". Signed-off-by: Matthieu Moy Signed-off-by: Timothee Albertin Signed-off-by: Nathan Payre Signed-off-by: Daniel Bensoussan Signed-off-by: Junio C Hamano --- Documentation/gitworkflows.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation') diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 177610e44e..2ed9451358 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -407,8 +407,8 @@ follows. `git pull ` ===================================== -Occasionally, the maintainer may get merge conflicts when he tries to -pull changes from downstream. In this case, he can ask downstream to +Occasionally, the maintainer may get merge conflicts when they try to +pull changes from downstream. In this case, they can ask downstream to do the merge and resolve the conflicts themselves (perhaps they will know better how to resolve them). It is one of the rare cases where downstream 'should' merge from upstream. -- cgit v1.2.3