doc: reword gitworkflows.txt for neutrality
Change 'he' to 'them' to be more neutral in "gitworkflows.txt". Signed-off-by: Matthieu Moy <matthieu.moy@univ-lyon1.fr> Signed-off-by: Timothee Albertin <timothee.albertin@etu.univ-lyon1.fr> Signed-off-by: Nathan Payre <nathan.payre@etu.univ-lyon1.fr> Signed-off-by: Daniel Bensoussan <daniel.bensoussan--bohm@etu.univ-lyon1.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Daniel Bensoussan committed
Dec 8, 2017 at 16:18 UTC
6b0eb884f9f2856d8c75671eb0e576c23288ab15
1 file changed
+2
-2
Documentation/gitworkflows.txt
+2
-2
@@ -407,8 +407,8 @@ follows.
407
`git pull <url> <branch>`
408
=====================================
409
410
-Occasionally, the maintainer may get merge conflicts when he tries to
411
-pull changes from downstream. In this case, he can ask downstream to
410
+Occasionally, the maintainer may get merge conflicts when they try to
411
+pull changes from downstream. In this case, they can ask downstream to
412
do the merge and resolve the conflicts themselves (perhaps they will
413
know better how to resolve them). It is one of the rare cases where
414
downstream 'should' merge from upstream.