Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'na/strtoimax'
[gitweb.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index 6ce54673b0c239a04503ce9da231826c61470bd1..e0df1b33408df881057963896fb0d0d3cd5edd66 100644
(file)
--- 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