diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-16 11:41:26 -0700 |
| commit | 412403eb454156ad5e1eafffc771e529730654aa (patch) | |
| tree | 1bb9b0335344512ba7be00e195ebfcb2d97987cc /Documentation/git-merge-index.txt | |
| parent | 5329c99795e187b36a527baa883efe5c3dc2f98c (diff) | |
| parent | 7791a1d9b9a4f4e15662c7c9c7f5837f461bb987 (diff) | |
| download | git-412403eb454156ad5e1eafffc771e529730654aa.tar.gz | |
Merge branch 'mz/doc-synopsis-verse' into maint
* mz/doc-synopsis-verse:
Documentation: use [verse] for SYNOPSIS sections
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 6ce54673b0..e0df1b3340 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -8,6 +8,7 @@ git-merge-index - Run a merge for files needing merging SYNOPSIS -------- +[verse] 'git merge-index' [-o] [-q] <merge-program> (-a | [--] <file>*) DESCRIPTION |