Merge branch 'jc/legacy-loose-object'

diff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt
index fe631bb3dd9096e831087511202e2771ebb85df4..98933764870fa73d693c636e713fd1f08eb8244d 100644 (file)
--- a/Documentation/git-relink.txt
+++ b/Documentation/git-relink.txt
@@ -7,12 +7,13 @@ git-relink - Hardlink common objects in local repositories
 
 SYNOPSIS
 --------
-'git-relink' [--safe] <dir> <dir> [<dir>]\*
+'git relink' [--safe] <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
 -------
@@ -23,14 +24,6 @@ OPTIONS
 <dir>::
        Directories containing a .git/objects/ subdirectory.
 
-Author
-------
-Written by Ryan Anderson <ryan@michonline.com>
-
-Documentation
---------------
-Documentation by Junio C Hamano and the git-list <git@vger.kernel.org>.
-
 GIT
 ---
-Part of the gitlink:git[7] suite
+Part of the linkgit:git[1] suite