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-one-file.txt | |
| parent | b1889c36d85514e5e70462294c561a02c2edfe2b (diff) | |
| download | git-483bc4f045881b998512ae814d6cf44d0c0cb493.tar.gz | |
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-one-file.txt')
| -rw-r--r-- | Documentation/git-merge-one-file.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt index 5c9ce641ec..62e09afe13 100644 --- a/Documentation/git-merge-one-file.txt +++ b/Documentation/git-merge-one-file.txt @@ -12,8 +12,8 @@ SYNOPSIS DESCRIPTION ----------- -This is the standard helper program to use with "git-merge-index" -to resolve a merge after the trivial merge done with "git-read-tree -m". +This is the standard helper program to use with `git-merge-index` +to resolve a merge after the trivial merge done with `git-read-tree -m`. Author ------ |