Merge branch 'js/maint-daemon-syslog'

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

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index a0ead2bbf33d7b244ec94e6f7dc06c062e52cb8d..ff088c5c294527dd97c542012483aafe3ca64314 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,24 +36,24 @@ OPTIONS
        failure usually indicates conflicts during merge). This is for
        porcelains which might want to emit custom messages.
 
        failure usually indicates conflicts during 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
 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.
+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

-RCS "merge" program merge object order. In the above ordering, the
+RCS 'merge' program merge object order. In the above ordering, the

 original is first. But the argument order to the 3-way merge program
 original is first. But the argument order to the 3-way merge program

-"merge" is to have the original in the middle. Don't ask me why.
+'merge' is to have the original in the middle. Don't ask me why.

 
 Examples:
 
 
 Examples:
 

-  torvalds@ppc970:~/merge-test> git-merge-index cat MM
+  torvalds@ppc970:~/merge-test> git merge-index cat MM

   This is MM from the original tree.                   # original
   This is modified MM in the branch A.                 # merge1
   This is modified MM in the branch B.                 # merge2
   This is MM from the original tree.                   # original
   This is modified MM in the branch A.                 # merge1
   This is modified MM in the branch B.                 # merge2


@@ -61,17 +61,17 @@ Examples:
 
 or
 
 
 or
 

-  torvalds@ppc970:~/merge-test> git-merge-index cat AA MM
+  torvalds@ppc970:~/merge-test> git merge-index cat AA MM

   cat: : No such file or directory
   This is added AA in the branch A.
   This is added AA in the branch B.
   This is added AA in the branch B.
   fatal: merge program failed
 
   cat: : No such file or directory
   This is added AA in the branch A.
   This is added AA in the branch B.
   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
-merge once anything has returned an error (i.e., "cat" returned an error
+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
 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
 ------