merge-recursive --renormalize

diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
index 2deba31763eb516a34d419cee5a98f7413f7f588..e5bdb5533e61687874ad36d30534b2ac9e58d7cb 100644 (file)
--- a/Documentation/git-repo-config.txt
+++ b/Documentation/git-repo-config.txt
@@ -8,11 +8,11 @@ git-repo-config - Get and set repository or global options
 
 SYNOPSIS
 --------
-'git-repo-config' ...
+'git repo-config' ...
 
 
 DESCRIPTION
 -----------
 
-This is a synonym for gitlink:git-config[1].  Please refer to the
+This is a synonym for linkgit:git-config[1].  Please refer to the
 documentation of that command.