summaryrefslogtreecommitdiffstats
path: root/git-push.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-07-19 14:04:03 -0700
committerJunio C Hamano <gitster@pobox.com>2021-07-19 14:04:03 -0700
commit3c27de63e121444e76e7178a4f5bdc73cfccb416 (patch)
treef073f5bb8d4ec01b8db8d5b301dff4b597be725d /git-push.html
parent91a411f3c81ee50b7d9a6476828a238397f5456a (diff)
downloadgit-htmldocs-3c27de63e121444e76e7178a4f5bdc73cfccb416.tar.gz
Autogenerated HTML docs for v2.32.0-349-gdaab8
Diffstat (limited to 'git-push.html')
-rw-r--r--git-push.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/git-push.html b/git-push.html
index 3b375790d..5a60e9fca 100644
--- a/git-push.html
+++ b/git-push.html
@@ -1070,8 +1070,8 @@ remote ref is the expected value. "git push" fails otherwise.</p></div>
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 <code>--force</code> will lose her work.</p></div>
+rebasing, the tip of the branch at the remote may advance with their
+commit, and blindly pushing with <code>--force</code> will lose their work.</p></div>
<div class="paragraph"><p>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
still points at the commit you specified, you can be sure that no
@@ -1971,7 +1971,7 @@ As in #1, the attacker chooses an object ID X to steal. The victim sends
<div id="footer">
<div id="footer-text">
Last updated
- 2021-03-24 15:15:46 PDT
+ 2021-07-19 14:01:20 PDT
</div>
</div>
</body>