merge-recursive --renormalize

diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index c2d55cdb5e8720be8892abf90b10379ca9cf3d65..04f99778d81def42e9e129b2f5b2b0551a0c760f 100755 (executable)
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@ -27,7 +27,7 @@ sub format_one {
                die "No description found in $name.txt";
        }
        if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) {
-               print $out "gitlink:$name\[1\]::\n\t";
+               print $out "linkgit:$name\[1\]::\n\t";
                if ($attr =~ / deprecated /) {
                        print $out "(deprecated) ";
                }