summaryrefslogtreecommitdiff
path: root/Documentation/everyday.txt
diff options
context:
space:
mode:
authorJustin Lebar <jlebar@google.com>2014-03-31 22:11:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-03-31 22:16:22 (GMT)
commita58088abe2011b6f486de8acd54432f6d9bcecfc (patch)
treefdae618dee73d4a349c80321896d4f4a58344c35 /Documentation/everyday.txt
parentcee0c2750bb5f1b38f15ef961517e03c2e39c9ec (diff)
downloadgit-a58088abe2011b6f486de8acd54432f6d9bcecfc.zip
git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.gz
git-a58088abe2011b6f486de8acd54432f6d9bcecfc.tar.bz2
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/everyday.txt')
-rw-r--r--Documentation/everyday.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt
index 2a18c1f..b2548ef 100644
--- a/Documentation/everyday.txt
+++ b/Documentation/everyday.txt
@@ -263,7 +263,7 @@ that are not quite ready.
<5> create topic branch as needed and apply, again with my
sign-offs.
<6> rebase internal topic branch that has not been merged to the
-master, nor exposed as a part of a stable branch.
+master or exposed as a part of a stable branch.
<7> restart `pu` every time from the next.
<8> and bundle topic branches still cooking.
<9> backport a critical fix.