Documentation: merge: add an overview

[git.git] / Documentation / merge-options.txt

diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index fec33943058ea3e139aff0b898ef55a677d4067e..5064bf83fa20c12cc699e5432e6dd6d29eda22de 100644 (file)
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -59,8 +59,8 @@ option can be used to override --squash.
        Use the given merge strategy; can be supplied more than
        once to specify them in the order they should be tried.
        If there is no `-s` option, a built-in list of strategies
-       is used instead ('git-merge-recursive' when merging a single
-       head, 'git-merge-octopus' otherwise).
+       is used instead ('git merge-recursive' when merging a single
+       head, 'git merge-octopus' otherwise).
 
 --summary::
 --no-summary::