RE: [PATCH] doc: reword gitworflows for neutrality

2017-12-10 Thread BENSOUSSAN--BOHM DANIEL p1507430
>As a native English speaker, I find the new phrasing odd, and think >this may a step backward. How about trying a different approach? For >example: >Occasionally, the maintainer may get merge conflicts when trying >to pull changes from downstream. In this case, it may make sense >to a

Re: [PATCH] doc: reword gitworflows for neutrality

2017-12-08 Thread Eric Sunshine
On Fri, Dec 8, 2017 at 10:18 AM, Daniel Bensoussan wrote: > doc: reword gitworflows for neutrality s/gitworflows/gitworkflows/ > Changed 'he' to 'them' to be more neutral in "gitworkflows.txt". > > See discussion at: > https://public-inbox.org/git/xmqqvahieeqy@gitster.mtv.corp.google.com/ >

[PATCH] doc: reword gitworflows for neutrality

2017-12-08 Thread Daniel Bensoussan
Changed 'he' to 'them' to be more neutral in "gitworkflows.txt". See discussion at: https://public-inbox.org/git/xmqqvahieeqy@gitster.mtv.corp.google.com/ Signed-off-by: Matthieu Moy Signed-off-by: Timothee Albertin Signed-off-by: Nathan Payre Signed-off-by: Daniel Bensoussan --- Docume