diff options
| author |  Jonathan Nieder <jrnieder@uchicago.edu> | 2008-07-03 00:55:07 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2008-07-05 11:24:40 -0700 |
| commit | 2fd02c92dbb6e575b7e62ea9dfa85ef45ebe58b6 (patch) | |
| tree | 36245e4f2c047fe68d7af66fd6b9c2619d2c6762 /Documentation/git-merge-file.txt | |
| parent | manpages: italicize gitk's name (where it was in teletype font) (diff) | |
| download | tgif-2fd02c92dbb6e575b7e62ea9dfa85ef45ebe58b6.tar.xz | |
manpages: italicize nongit command names (if they are in teletype font)
Some manual pages use teletype font to set command names. We
change them to use italics, instead. This creates a visual
distinction between names of commands and command lines that
can be typed at the command line. It is also more consistent
with other man pages outside Git.
In this patch, the commands named are non-git commands like bash.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt index 6e70ea4923..024ec015a3 100644 --- a/Documentation/git-merge-file.txt +++ b/Documentation/git-merge-file.txt @@ -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. -'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]. |