commit a58088abe2011b6f486de8acd54432f6d9bcecfc
author Justin Lebar <jlebar@google.com> Mon Mar 31 15:11:44 2014 -0700
committer Junio C Hamano <gitster@pobox.com> Mon Mar 31 15:16:22 2014 -0700
tree fdae618dee73d4a349c80321896d4f4a58344c35
parent cee0c2750bb5f1b38f15ef961517e03c2e39c9ec

Documentation: fix misuses of "nor"

Signed-off-by: Justin Lebar <jlebar@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

Documentation/howto/rebase-from-internal-branch.txt

diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 19ab604..02cb5f7 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -139,7 +139,7 @@
     $ git fetch upstream
 
 This leaves the updated upstream head in .git/FETCH_HEAD but
-does not touch your .git/HEAD nor .git/refs/heads/master.
+does not touch your .git/HEAD or .git/refs/heads/master.
 You run "git rebase" now.
 
     $ git rebase FETCH_HEAD master