Merge branch 'jf/merge-ignore-ws'

diff --git a/Documentation/git-relink.txt b/Documentation/git-relink.txt
index 25ff8f9dcbe0db52675338f1429e9169052b9cf1..8fc809f82b2fae71f5cf6315dec707b649931382 100644 (file)
--- a/Documentation/git-relink.txt
+++ b/Documentation/git-relink.txt
@@ -7,7 +7,7 @@ git-relink - Hardlink common objects in local repositories
 
 SYNOPSIS
 --------
-'git relink' [--safe] <dir> [<dir>]\* <master_dir>
+'git relink' [--safe] <dir>... <master_dir>
 
 DESCRIPTION
 -----------