diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-07-17 00:42:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-07-17 00:42:53 (GMT) |
| commit | 8e62a85352e998415934ac24c6b0db3cd37d372e (patch) | |
| tree | a20215a476e1ef6f8fdff13bff82398a16f1f4f7 /Documentation/git-push.txt | |
| parent | 8721e2eaedd0290ef399f638912a49b36402e715 (diff) | |
| parent | 46a237f42fe24545e6a2a72488ad04d836f91717 (diff) | |
| download | git-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/git-push.txt')
| -rw-r--r-- | Documentation/git-push.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index a953c7c..2f25aa3 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -244,8 +244,8 @@ Imagine that you have to rebase what you have already published. You will have to bypass the "must fast-forward" rule in order to replace the history you originally published with the rebased history. If somebody else built on top of your original history while you are -rebasing, the tip of the branch at the remote may advance with her -commit, and blindly pushing with `--force` will lose her work. +rebasing, the tip of the branch at the remote may advance with their +commit, and blindly pushing with `--force` will lose their work. + This option allows you to say that you expect the history you are updating is what you rebased and want to replace. If the remote ref |