Skip to content

Commit 6b0eb88

Browse files
dnl413gitster
authored andcommitted
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>
1 parent 3013dff commit 6b0eb88

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Documentation/gitworkflows.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,8 +407,8 @@ follows.
407407
`git pull <url> <branch>`
408408
=====================================
409409

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
412412
do the merge and resolve the conflicts themselves (perhaps they will
413413
know better how to resolve them). It is one of the rare cases where
414414
downstream 'should' merge from upstream.

0 commit comments

Comments
 (0)