projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mailinfo: ignore blanks after in-body headers.
[git.git]
/
Documentation
/
git-merge-index.txt
diff --git
a/Documentation/git-merge-index.txt
b/Documentation/git-merge-index.txt
index
fbc986a
..
6cd0601
100644
(file)
--- a/
Documentation/git-merge-index.txt
+++ b/
Documentation/git-merge-index.txt
@@
-8,7
+8,7
@@
git-merge-index - Runs a merge for files needing merging
SYNOPSIS
--------
SYNOPSIS
--------
-'git-merge-index' [-o] [-q] <merge-program> (-a | -- | <file>\*)
+'git-merge-index' [-o] [-q] <merge-program> (-a |
\
-- | <file>\*)
DESCRIPTION
-----------
DESCRIPTION
-----------
@@
-19,7
+19,7
@@
files are passed as arguments 5, 6 and 7.
OPTIONS
-------
OPTIONS
-------
---::
+
\
--::
Do not interpret any more arguments as options.
-a::
Do not interpret any more arguments as options.
-a::
@@
-69,7
+69,7
@@
or
fatal: merge program failed
where the latter example shows how "git-merge-index" will stop trying to
fatal: merge program failed
where the latter example shows how "git-merge-index" will stop trying to
-merge once anything has returned an error (i
e
"cat" returned an error
+merge once anything has returned an error (i
.e.,
"cat" returned an error
for the AA file, because it didn't exist in the original, and thus
"git-merge-index" didn't even try to merge the MM thing).
for the AA file, because it didn't exist in the original, and thus
"git-merge-index" didn't even try to merge the MM thing).