Merge branch 'jc/apply-whitespace'

diff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt
index 25975ae4023e80bd08daafefccf8ec4710182a60..1b024ded33d1480179630cddaab13e0375bf2120 100644 (file)
--- a/Documentation/git-relink.txt
+++ b/Documentation/git-relink.txt
@@ -3,16 +3,17 @@ git-relink(1)
 
 NAME
 ----
-git-relink - Hardlink common objects in local repositories.
+git-relink - Hardlink common objects in local repositories
 
 SYNOPSIS
 --------
-'git-relink' [--safe] <dir> <dir> [<dir>]\*
+'git-relink' [--safe] <dir> [<dir>]\* <master_dir>
 
 DESCRIPTION
 -----------
-This will scan 2 or more object repositories and look for common objects, check
-if they are hardlinked, and replace one with a hardlink to the other if not.
+This will scan 1 or more object repositories and look for objects in common
+with a master repository. Objects not already hardlinked to the master
+repository will be replaced with a hardlink to the master repository.
 
 OPTIONS
 -------
@@ -33,5 +34,4 @@ Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
 
 GIT
 ---
-Part of the link:git.html[git] suite
-
+Part of the linkgit:git[7] suite