diff options
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index b726ddfe12..19ee017aed 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -8,7 +8,7 @@ git-merge-index - Run a merge for files needing merging SYNOPSIS -------- -'git-merge-index' [-o] [-q] <merge-program> (-a | \-- | <file>\*) +'git-merge-index' [-o] [-q] <merge-program> (-a | [--] <file>\*) DESCRIPTION ----------- @@ -84,4 +84,4 @@ Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel GIT --- -Part of the gitlink:git[7] suite +Part of the linkgit:git[7] suite |