Documentation: fix description for enabling hooks

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

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index 149f1310519bb5b732fca0926f786f80a153f8da..303537357b2fb5d1a0d7fa291d51803ddb97749c 100644 (file)
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -9,23 +9,23 @@ git-merge-file - Run a three-way file merge
 SYNOPSIS
 --------
 [verse]
 SYNOPSIS
 --------
 [verse]

-'git-merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
+'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]

        [-p|--stdout] [-q|--quiet] <current-file> <base-file> <other-file>
 
 
 DESCRIPTION
 -----------
        [-p|--stdout] [-q|--quiet] <current-file> <base-file> <other-file>
 
 
 DESCRIPTION
 -----------

-git-file-merge incorporates all changes that lead from the `<base-file>`
+'git-merge-file' incorporates all changes that lead from the `<base-file>`

 to `<other-file>` into `<current-file>`. The result ordinarily goes into
 to `<other-file>` into `<current-file>`. The result ordinarily goes into

-`<current-file>`. git-merge-file is useful for combining separate changes
+`<current-file>`. 'git-merge-file' is useful for combining separate changes

 to an original. Suppose `<base-file>` is the original, and both
 to an original. Suppose `<base-file>` is the original, and both

-`<current-file>` and `<other-file>` are modifications of `<base-file>`.
-Then git-merge-file combines both changes.
+`<current-file>` and `<other-file>` are modifications of `<base-file>`,
+then 'git-merge-file' combines both changes.

 
 A conflict occurs if both `<current-file>` and `<other-file>` have changes
 
 A conflict occurs if both `<current-file>` and `<other-file>` have changes

-in a common segment of lines. If a conflict is found, git-merge-file
-normally outputs a warning and brackets the conflict with <<<<<<< and
->>>>>>> lines. A typical conflict will look like this:
+in a common segment of lines. If a conflict is found, 'git-merge-file'
+normally outputs a warning and brackets the conflict with lines containing
+<<<<<<< and >>>>>>> markers. A typical conflict will look like this:

 
        <<<<<<< A
        lines in file A
 
        <<<<<<< A
        lines in file A


@@ -39,8 +39,8 @@ the alternatives.
 The exit value of this program is negative on error, and the number of
 conflicts otherwise. If the merge was clean, the exit value is 0.
 
 The exit value of this program is negative on error, and the number of
 conflicts otherwise. If the merge was clean, the exit value is 0.
 

-git-merge-file is designed to be a minimal clone of RCS merge, that is, it
-implements all of RCS merge's functionality which is needed by
+'git-merge-file' is designed to be a minimal clone of RCS 'merge'; that is, it
+implements all of RCS 'merge''s functionality which is needed by

 linkgit:git[1].
 
 
 linkgit:git[1].
 
 


@@ -51,7 +51,7 @@ OPTIONS
        This option may be given up to three times, and
        specifies labels to be used in place of the
        corresponding file names in conflict reports. That is,
        This option may be given up to three times, and
        specifies labels to be used in place of the
        corresponding file names in conflict reports. That is,

-       `git-merge-file -L x -L y -L z a b c` generates output that
+       `git merge-file -L x -L y -L z a b c` generates output that

        looks like it came from files x, y and z instead of
        from files a, b and c.
 
        looks like it came from files x, y and z instead of
        from files a, b and c.
 


@@ -60,7 +60,7 @@ OPTIONS
        `<current-file>`.
 
 -q::
        `<current-file>`.
 
 -q::

-       Quiet;  do  not  warn about conflicts.
+       Quiet; do not warn about conflicts.

 
 
 EXAMPLES
 
 
 EXAMPLES


@@ -85,7 +85,7 @@ Written by Johannes Schindelin <johannes.schindelin@gmx.de>
 Documentation
 --------------
 Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
 Documentation
 --------------
 Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,

-with parts copied from the original documentation of RCS merge.
+with parts copied from the original documentation of RCS 'merge'.

 
 GIT
 ---
 
 GIT
 ---