summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-file.txt
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@uchicago.edu>2008-07-03 00:37:18 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-05 11:24:39 -0700
commit0979c106498f21838140313b485f90faf06f454f (patch)
treea5fdc36e5afcaf1557fd3389ca32bd08d8a2fe36 /Documentation/git-merge-file.txt
parentmanpages: italicize command names in synopses (diff)
downloadtgif-0979c106498f21838140313b485f90faf06f454f.tar.xz
manpages: italicize command names
This includes nongit commands like RCS 'merge'. This patch only italicizes names of commands if they had no formatting before. 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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index f057e49951..2a418175ac 100644
--- a/Documentation/git-merge-file.txt
+++ b/Documentation/git-merge-file.txt
@@ -85,7 +85,7 @@ Written by Johannes Schindelin <johannes.schindelin@gmx.de>
Documentation
--------------
Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
-with parts copied from the original documentation of RCS merge.
+with parts copied from the original documentation of RCS 'merge'.
GIT
---