diff options
author | Justin Lebar <jlebar@google.com> | 2014-03-31 15:11:44 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-03-31 15:16:22 -0700 |
commit | a58088abe2011b6f486de8acd54432f6d9bcecfc (patch) | |
tree | fdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/howto/revert-a-faulty-merge.txt | |
parent | cee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff) | |
download | git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.gz git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.xz |
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/howto/revert-a-faulty-merge.txt')
-rw-r--r-- | Documentation/howto/revert-a-faulty-merge.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt index acf3e477e..462255ed5 100644 --- a/Documentation/howto/revert-a-faulty-merge.txt +++ b/Documentation/howto/revert-a-faulty-merge.txt @@ -54,7 +54,7 @@ where C and D are to fix what was broken in A and B, and you may already have some other changes on the mainline after W. If you merge the updated side branch (with D at its tip), none of the -changes made in A nor B will be in the result, because they were reverted +changes made in A or B will be in the result, because they were reverted by W. That is what Alan saw. Linus explains the situation: @@ -90,7 +90,7 @@ with: $ git revert W This history would (ignoring possible conflicts between what W and W..Y -changed) be equivalent to not having W nor Y at all in the history: +changed) be equivalent to not having W or Y at all in the history: ---o---o---o---M---x---x-------x---- / |