diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-16 17:42:53 -0700 |
| commit | 8e62a85352e998415934ac24c6b0db3cd37d372e (patch) | |
| tree | a20215a476e1ef6f8fdff13bff82398a16f1f4f7 /Documentation/user-manual.txt | |
| parent | Merge branch 'jt/partial-clone-submodule-1' (diff) | |
| parent | *: fix typos (diff) | |
| download | tgif-8e62a85352e998415934ac24c6b0db3cd37d372e.tar.xz | |
Merge branch 'ds/gender-neutral-doc'
Update the documentation not to assume users are of certain gender
and adds to guidelines to do so.
* ds/gender-neutral-doc:
*: fix typos
comments: avoid using the gender of our users
doc: avoid using the gender of other people
Diffstat (limited to 'Documentation/user-manual.txt')
| -rw-r--r-- | Documentation/user-manual.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index f9e54b8674..96240598e3 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -2792,7 +2792,7 @@ A fast-forward looks something like this: In some cases it is possible that the new head will *not* actually be a descendant of the old head. For example, the developer may have -realized she made a serious mistake, and decided to backtrack, +realized a serious mistake was made and decided to backtrack, resulting in a situation like: ................................................ |