diff options
| author | Justin Lebar <jlebar@google.com> | 2014-04-01 02:11:44 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-04-01 02:16:22 +0400 |
| commit | a58088abe2011b6f486de8acd54432f6d9bcecfc (patch) | |
| tree | fdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/git-push.txt | |
| parent | cee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff) | |
Documentation: fix misuses of "nor"
Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-push.txt')
| -rw-r--r-- | Documentation/git-push.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index 2b7f4f939f..d0b9e2f235 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -385,7 +385,7 @@ will now start building on top of B. The command by default does not allow an update that is not a fast-forward to prevent such loss of history. -If you do not want to lose your work (history from X to B) nor the work by +If you do not want to lose your work (history from X to B) or the work by the other person (history from X to A), you would need to first fetch the history from the repository, create a history that contains changes done by both parties, and push the result back. |