From a58088abe2011b6f486de8acd54432f6d9bcecfc Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Mon, 31 Mar 2014 15:11:44 -0700 Subject: Documentation: fix misuses of "nor" Signed-off-by: Justin Lebar Signed-off-by: Junio C Hamano --- Documentation/git-push.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-push.txt') 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. -- cgit v1.3-5-g9baa