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>

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 13b17a5a1ea8ae86406f17f5771f1cb8703dde80..93a6a83b95609f7362a1d2d0bc72ac20988c1d26 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -568,7 +568,7 @@ diff.external::
 
 diff.renameLimit::
        The number of files to consider when performing the copy/rename
 
 diff.renameLimit::
        The number of files to consider when performing the copy/rename

-       detection; equivalent to the git-diff option '-l'.
+       detection; equivalent to the 'git-diff' option '-l'.

 
 diff.renames::
        Tells git to detect renames.  If set to any boolean value, it
 
 diff.renames::
        Tells git to detect renames.  If set to any boolean value, it


@@ -844,7 +844,7 @@ instaweb.port::
 
 log.date::
        Set default date-time mode for the log command. Setting log.date
 
 log.date::
        Set default date-time mode for the log command. Setting log.date

-       value is similar to using git-log's --date option. The value is one of the
+       value is similar to using 'git-log'\'s --date option. The value is one of the

        following alternatives: {relative,local,default,iso,rfc,short}.
        See linkgit:git-log[1].
 
        following alternatives: {relative,local,default,iso,rfc,short}.
        See linkgit:git-log[1].
 

diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 70d19f63eb562063dd373a4474f6efc0e2ea32dc..b7e51b885c5e7e6134e37bad2c722bc010bdc052 100644 (file)
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -18,7 +18,7 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------

-Reads supplied diff output and applies it on a git index file
+Reads supplied 'diff' output and applies it on a git index file

 and a work tree.
 
 OPTIONS
 and a work tree.
 
 OPTIONS


@@ -165,9 +165,9 @@ behavior:
 * `error-all` is similar to `error` but shows all errors.
 
 --inaccurate-eof::
 * `error-all` is similar to `error` but shows all errors.
 
 --inaccurate-eof::

-       Under certain circumstances, some versions of diff do not correctly
+       Under certain circumstances, some versions of 'diff' do not correctly

        detect a missing new-line at the end of the file. As a result, patches
        detect a missing new-line at the end of the file. As a result, patches

-       created by such diff programs do not record incomplete lines
+       created by such 'diff' programs do not record incomplete lines

        correctly. This option adds support for applying such patches by
        working around this bug.
 
        correctly. This option adds support for applying such patches by
        working around this bug.
 

diff --git a/Documentation/git-merge-file.txt b/Documentation/git-merge-file.txt
index f057e49951188efa311997e4f79f1ccd480ed1b3..2a418175acbe81d8463a32450210b310c35e3cb9 100644 (file)
--- 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>,
 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
 ---
 
 GIT
 ---

diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt
index 43680840e15d677ad54ad5de8561dfff4e63662d..4f04bbb1aa573e7092c48add8571fb8203537412 100644 (file)
--- a/Documentation/git-merge-index.txt
+++ b/Documentation/git-merge-index.txt
@@ -41,7 +41,7 @@ processes them in turn only stopping if merge returns a non-zero exit
 code.
 
 Typically this is run with a script calling git's imitation of
 code.
 
 Typically this is run with a script calling git's imitation of

-the merge command from the RCS package.
+the 'merge' command from the RCS package.

 
 A sample script called `git-merge-one-file` is included in the
 distribution.
 
 A sample script called `git-merge-one-file` is included in the
 distribution.

diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index ae2b2b543ab9ed9d87019fc72c4fdb189ca72902..30ec68d3ebab25718967f93f66b05560c238f707 100644 (file)
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-'git rerere' [clear|diff|status|gc]
+'git rerere' ['clear'|'diff'|'status'|'gc']

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -49,7 +49,7 @@ conflicts.  Additional arguments are passed directly to the system
 
 'status'::
 
 
 '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'::
 for resolutions.
 
 'gc'::

diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index 1171b5c604c4fd42e8a491d8df44e7f94c53ea4e..949332b58e430ce6c776fbb2d11c35afa1f70255 100644 (file)
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -7,7 +7,7 @@ gitdiffcore - Tweaking diff output (June 2005)
 
 SYNOPSIS
 --------
 
 SYNOPSIS
 --------

-git diff *
+'git diff' *

 
 DESCRIPTION
 -----------
 
 DESCRIPTION
 -----------


@@ -16,7 +16,7 @@ The diff commands `git-diff-index`, `git-diff-files`, and `git-diff-tree`
 can be told to manipulate differences they find in
 unconventional ways before showing `diff` output.  The manipulation
 is collectively called "diffcore transformation".  This short note
 can be told to manipulate differences they find in
 unconventional ways before showing `diff` output.  The manipulation
 is collectively called "diffcore transformation".  This short note

-describes what they are and how to use them to produce diff output
+describes what they are and how to use them to produce 'diff' output

 that is easier to understand than the conventional kind.
 
 
 that is easier to understand than the conventional kind.