Merge branch 'wk/doc-clarify-upstream'

diff --git a/remote.c b/remote.c
index 6d424680c2987575d3958d42d540393586128ae9..eea2c8de45052e3e3a59fb150eef3f54c6086800 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1481,7 +1481,7 @@ int match_push_refs(struct ref *src, struct ref **dst,
                                /*
                                 * Remote doesn't have it, and we have no
                                 * explicit pattern, and we don't have
-                                * --all nor --mirror.
+                                * --all or --mirror.
                                 */
                                goto free_name;