summaryrefslogtreecommitdiff
path: root/Documentation/git-rerere.txt
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@uchicago.edu>2008-07-03 00:37:18 -0500
committerJunio C Hamano <gitster@pobox.com>2008-07-05 11:24:39 -0700
commit0979c106498f21838140313b485f90faf06f454f (patch)
treea5fdc36e5afcaf1557fd3389ca32bd08d8a2fe36 /Documentation/git-rerere.txt
parent04c2407eafa0361439a60fd6240447f3404d014b (diff)
downloadgit-0979c106498f21838140313b485f90faf06f454f.tar.gz
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-rerere.txt')
-rw-r--r--Documentation/git-rerere.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index ae2b2b543a..30ec68d3eb 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
-'git rerere' [clear|diff|status|gc]
+'git rerere' ['clear'|'diff'|'status'|'gc']
DESCRIPTION
-----------
@@ -49,7 +49,7 @@ conflicts. Additional arguments are passed directly to the system
'status'::
-Like diff, but this only prints the filenames that will be tracked
+Like 'diff', but this only prints the filenames that will be tracked
for resolutions.
'gc'::