diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-05-05 23:14:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-05-05 23:14:25 +0000 |
| commit | 1bb569ec8189e0498dc17c57e9237ffd85beb273 (patch) | |
| tree | 810ac97c3b91652af2e900f2779e111965c4984d /git-merge-index.txt | |
| parent | 88a3a070894a23a10133fee89065cb27199cf58b (diff) | |
| download | git-htmldocs-1bb569ec8189e0498dc17c57e9237ffd85beb273.tar.gz | |
Autogenerated HTML docs for v1.3.2-g8611
Diffstat (limited to 'git-merge-index.txt')
| -rw-r--r-- | git-merge-index.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge-index.txt b/git-merge-index.txt index fbc986aa8..332e023d0 100644 --- a/git-merge-index.txt +++ b/git-merge-index.txt @@ -8,7 +8,7 @@ git-merge-index - Runs 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 ----------- @@ -19,7 +19,7 @@ files are passed as arguments 5, 6 and 7. OPTIONS ------- ---:: +\--:: Do not interpret any more arguments as options. -a:: |