aboutsummaryrefslogtreecommitdiff
path: root/Documentation/git-merge-one-file.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-07-03 00:41:41 -0500
committerJunio C Hamano <gitster@pobox.com>2008-07-05 11:24:40 -0700
commitba020ef5eb5fca3d757bd580ff117adaf81ca079 (patch)
tree974c4e60c9bc212d0ce939b31e8fbb61b5fb1f07 /Documentation/git-merge-one-file.txt
parent0979c106498f21838140313b485f90faf06f454f (diff)
downloadgit-ba020ef5eb5fca3d757bd580ff117adaf81ca079.tar.gz
git-ba020ef5eb5fca3d757bd580ff117adaf81ca079.tar.xz
manpages: italicize git command names (which were in teletype font)
The names of git commands are not meant to be entered at the commandline; they are just names. So we render them in italics, as is usual for command names in manpages. Using doit () { perl -e 'for (<>) { s/\`(git-[^\`.]*)\`/'\''\1'\''/g; print }' } for i in git*.txt config.txt diff*.txt blame*.txt fetch*.txt i18n.txt \ merge*.txt pretty*.txt pull*.txt rev*.txt urls*.txt do doit <"$i" >"$i+" && mv "$i+" "$i" done git diff . 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.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-merge-one-file.txt b/Documentation/git-merge-one-file.txt
index 62e09afe1..1dd134538 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
------