Merge branch 'jn/merge-custom-no-trivial'

[git.git] / Documentation / git-merge-index.txt

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 123e6d024a47537981526d0c078249565e72d74f..921b38f18374c20d1f94c0907a629425acb38aa4 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -8,7 +8,7 @@ git-merge-index - Run 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
 -----------


@@ -36,14 +36,14 @@ OPTIONS
        failure usually indicates conflicts during the merge). This is for
        porcelains which might want to emit custom messages.
 
        failure usually indicates conflicts during the merge). This is for
        porcelains which might want to emit custom messages.
 

-If 'git-merge-index' is called with multiple <file>s (or -a) then it
+If 'git merge-index' is called with multiple <file>s (or -a) then it

 processes them in turn only stopping if merge returns a non-zero exit
 code.
 
 Typically this is run with a script calling git's imitation of
 the 'merge' command from the RCS package.
 
 processes them in turn only stopping if merge returns a non-zero exit
 code.
 
 Typically this is run with a script calling git's imitation of
 the 'merge' command from the RCS package.
 

-A sample script called 'git-merge-one-file' is included in the
+A sample script called 'git merge-one-file' is included in the

 distribution.
 
 ALERT ALERT ALERT! The git "merge object order" is different from the
 distribution.
 
 ALERT ALERT ALERT! The git "merge object order" is different from the


@@ -68,10 +68,10 @@ or
   This is added AA in the branch B.
   fatal: merge program failed
 
   This is added AA in the branch B.
   fatal: merge program failed
 

-where the latter example shows how 'git-merge-index' will stop trying to
+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
 for the AA file, because it didn't exist in the original, and thus
 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).
+'git merge-index' didn't even try to merge the MM thing).

 
 Author
 ------
 
 Author
 ------