summaryrefslogtreecommitdiff
path: root/Documentation/user-manual.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-17 00:42:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-07-17 00:42:53 (GMT)
commit8e62a85352e998415934ac24c6b0db3cd37d372e (patch)
treea20215a476e1ef6f8fdff13bff82398a16f1f4f7 /Documentation/user-manual.txt
parent8721e2eaedd0290ef399f638912a49b36402e715 (diff)
parent46a237f42fe24545e6a2a72488ad04d836f91717 (diff)
downloadgit-8e62a85352e998415934ac24c6b0db3cd37d372e.zip
git-8e62a85352e998415934ac24c6b0db3cd37d372e.tar.gz
git-8e62a85352e998415934ac24c6b0db3cd37d372e.tar.bz2
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index f9e54b8..9624059 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:
................................................