From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Dec 2017 19:16:25 +0000 (-0800)
Subject: Merge branch 'db/doc-workflows-neuter-the-maintainer'
X-Git-Tag: v2.16.0-rc0~29
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f7bbca1cae80657f0ff782e7ccace810e9e723f8?ds=inline;hp=-c

Merge branch 'db/doc-workflows-neuter-the-maintainer'

Docfix.

* db/doc-workflows-neuter-the-maintainer:
doc: reword gitworkflows.txt for neutrality
---

f7bbca1cae80657f0ff782e7ccace810e9e723f8
diff --combined Documentation/gitworkflows.txt
index 02569d0614,2ed9451358..926e044d09
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@@ -40,7 -40,7 +40,7 @@@ beginning. It is always easier to squas
  to split one big commit into several.  Don't be afraid of making too
  small or imperfect steps along the way. You can always go back later
  and edit the commits with `git rebase --interactive` before you
 -publish them.  You can use `git stash save --keep-index` to run the
 +publish them.  You can use `git stash push --keep-index` to run the
  test suite independent of other uncommitted changes; see the EXAMPLES
  section of linkgit:git-stash[1].
  
@@@ -407,8 -407,8 +407,8 @@@ follows
  `git pull <url> <branch>`
  =====================================
  
- 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.