Merge branch 'jk/pretty-G-format-fixes'

diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 058ac0dc854bfd55a13dd0776beaf36b37e8b8a9..7a493c80f776092265abd4fb2575639e683bcf5c 100644 (file)
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -56,7 +56,7 @@ OPTIONS
 EXAMPLE
 -------
 
-To prune objects not used by your repository nor another that
+To prune objects not used by your repository or another that
 borrows from your repository via its
 `.git/objects/info/alternates`: