Merge branch 'jc/upload-corrupt' into next

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 9cc7c74deab0251eba8e34daf2b3c718071bedfd..2ff74949a73aa8670750105a7d292206877477c7 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -76,7 +76,7 @@ OPTIONS
 -C<n>::
        Ensure at least <n> lines of surrounding context match before
        and after each change.  When fewer lines of surrounding
-       context exist they all most match.  By default no context is
+       context exist they all must match.  By default no context is
        ever ignored.
 
 --apply::