summaryrefslogtreecommitdiffstats
path: root/git-push.txt
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.txt
parent91a411f3c81ee50b7d9a6476828a238397f5456a (diff)
downloadgit-htmldocs-3c27de63e121444e76e7178a4f5bdc73cfccb416.tar.gz
Autogenerated HTML docs for v2.32.0-349-gdaab8
Diffstat (limited to 'git-push.txt')
-rw-r--r--git-push.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-push.txt b/git-push.txt
index a953c7c38..2f25aa3a2 100644
--- a/git-push.txt
+++ b/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