projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Autogenerated man pages for v1.3.2-g8611
[git.git]
/
man1
/
git-merge-index.1
diff --git
a/man1/git-merge-index.1
b/man1/git-merge-index.1
index
5d68938
..
7bef26b
100755
(executable)
--- a/
man1/git-merge-index.1
+++ b/
man1/git-merge-index.1
@@
-23,7
+23,7
@@
git-merge-index \- Runs a merge for files needing merging
.SH "SYNOPSIS"
.SH "SYNOPSIS"
-
git\-merge\-index [\-o] [\-q] <merge\-program> (\-a | -
- | <file>*)
+
\fIgit\-merge\-index\fR [\-o] [\-q] <merge\-program> (\-a | \-\
- | <file>*)
.SH "DESCRIPTION"
.SH "DESCRIPTION"
@@
-33,7
+33,7
@@
This looks up the <file>(s) in the index and, if there are any merge entries, pa
.SH "OPTIONS"
.TP
.SH "OPTIONS"
.TP
-
-
-
+
\-\
-
Do not interpret any more arguments as options\&.
.TP
Do not interpret any more arguments as options\&.
.TP