diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2008-02-22 22:57:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2008-02-22 22:57:06 +0000 |
| commit | 074766f3e6232dcb7254da10f6c1cc3c9da1fb0c (patch) | |
| tree | 7a540b489116790971212415f0986824bdd7eda2 /git-merge-index.txt | |
| parent | 83d46a2997fadfa1cbb85053f1c7315fa3591d67 (diff) | |
| download | git-htmldocs-074766f3e6232dcb7254da10f6c1cc3c9da1fb0c.tar.gz | |
Autogenerated HTML docs for v1.5.4.2-197-g22c43
Diffstat (limited to 'git-merge-index.txt')
| -rw-r--r-- | git-merge-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-merge-index.txt b/git-merge-index.txt index 5d816d0d8..19ee017ae 100644 --- a/git-merge-index.txt +++ b/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 ----------- |