parse-options: be able to generate usages automatically

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index b1771a13c88fa8ec8d5ca6e04c8d5b73bee3209e..bca4212e565c95f79a76a14cc4444e72e472a22c 100644 (file)
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -56,7 +56,7 @@ merge.verbosity::
        message if conflicts were detected. Level 1 outputs only
        conflicts, 2 outputs conflicts and file changes.  Level 5 and
        above outputs debugging information.  The default is level 2.
-       Can be overriden by 'GIT_MERGE_VERBOSITY' environment variable.
+       Can be overridden by 'GIT_MERGE_VERBOSITY' environment variable.
 
 branch.<name>.mergeoptions::
        Sets default options for merging into branch <name>. The syntax and