diff options
| author | Jonathan Nieder <jrnieder@uchicago.edu> | 2008-06-30 13:56:34 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-01 17:20:16 -0700 |
| commit | 483bc4f045881b998512ae814d6cf44d0c0cb493 (patch) | |
| tree | 1812b25a8f08841bd4cfb6566636ce6fb5b8eac3 /Documentation/git-merge-file.txt | |
| parent | b1889c36d85514e5e70462294c561a02c2edfe2b (diff) | |
| download | git-483bc4f045881b998512ae814d6cf44d0c0cb493.tar.gz git-483bc4f045881b998512ae814d6cf44d0c0cb493.tar.xz | |
Documentation formatting and cleanup
Following what appears to be the predominant style, format
names of commands and commandlines both as `teletype text`.
While we're at it, add articles ("a" and "the") in some
places, italicize the name of the command in the manual page
synopsis line, and add a comma or two where it seems appropriate.
Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
| -rw-r--r-- | Documentation/git-merge-file.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 2a683f14e..f057e4995 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -15,15 +15,15 @@ SYNOPSIS DESCRIPTION ----------- -git-file-merge incorporates all changes that lead from the `<base-file>` +`git-file-merge` incorporates all changes that lead from the `<base-file>` 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 `<current-file>` and `<other-file>` are modifications of `<base-file>`. -Then git-merge-file combines both changes. +Then `git-merge-file` combines both 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 +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: @@ -39,7 +39,7 @@ 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. -git-merge-file is designed to be a minimal clone of RCS merge, that is, it +`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]. |