summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-07-03 05:55:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-05 18:24:40 (GMT)
commit2fd02c92dbb6e575b7e62ea9dfa85ef45ebe58b6 (patch)
tree36245e4f2c047fe68d7af66fd6b9c2619d2c6762 /Documentation/gitattributes.txt
parent42d36bb841eb035eb0f7261f02987893c14e1a02 (diff)
downloadgit-2fd02c92dbb6e575b7e62ea9dfa85ef45ebe58b6.zip
git-2fd02c92dbb6e575b7e62ea9dfa85ef45ebe58b6.tar.gz
git-2fd02c92dbb6e575b7e62ea9dfa85ef45ebe58b6.tar.bz2
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/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 0b53044..6a246eb 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -278,7 +278,7 @@ is prefixed with a line of the form:
The text is called 'hunk header', and by default a line that
begins with an alphabet, an underscore or a dollar sign is used,
-which matches what GNU `diff -p` output uses. This default
+which matches what GNU 'diff -p' output uses. This default
selection however is not suited for some contents, and you can
use customized pattern to make a selection.
@@ -322,7 +322,7 @@ and other programs such as `git revert` and `git cherry-pick`.
Set::
Built-in 3-way merge driver is used to merge the
- contents in a way similar to `merge` command of `RCS`
+ contents in a way similar to 'merge' command of `RCS`
suite. This is suitable for ordinary text files.
Unset::
@@ -426,7 +426,7 @@ Checking whitespace errors
^^^^^^^^^^^^
The `core.whitespace` configuration variable allows you to define what
-`diff` and `apply` should consider whitespace errors for all paths in
+'diff' and 'apply' should consider whitespace errors for all paths in
the project (See linkgit:git-config[1]). This attribute gives you finer
control per path.