Skip to content

Commit 0979c10

Browse files
Jonathan Niedergitster
authored andcommitted
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>
1 parent 04c2407 commit 0979c10

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

Documentation/config.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ diff.external::
568568

569569
diff.renameLimit::
570570
The number of files to consider when performing the copy/rename
571-
detection; equivalent to the git-diff option '-l'.
571+
detection; equivalent to the 'git-diff' option '-l'.
572572

573573
diff.renames::
574574
Tells git to detect renames. If set to any boolean value, it
@@ -844,7 +844,7 @@ instaweb.port::
844844

845845
log.date::
846846
Set default date-time mode for the log command. Setting log.date
847-
value is similar to using git-log's --date option. The value is one of the
847+
value is similar to using 'git-log'\'s --date option. The value is one of the
848848
following alternatives: {relative,local,default,iso,rfc,short}.
849849
See linkgit:git-log[1].
850850

Documentation/git-apply.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ SYNOPSIS
1818

1919
DESCRIPTION
2020
-----------
21-
Reads supplied diff output and applies it on a git index file
21+
Reads supplied 'diff' output and applies it on a git index file
2222
and a work tree.
2323

2424
OPTIONS
@@ -165,9 +165,9 @@ behavior:
165165
* `error-all` is similar to `error` but shows all errors.
166166

167167
--inaccurate-eof::
168-
Under certain circumstances, some versions of diff do not correctly
168+
Under certain circumstances, some versions of 'diff' do not correctly
169169
detect a missing new-line at the end of the file. As a result, patches
170-
created by such diff programs do not record incomplete lines
170+
created by such 'diff' programs do not record incomplete lines
171171
correctly. This option adds support for applying such patches by
172172
working around this bug.
173173

Documentation/git-merge-file.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Written by Johannes Schindelin <johannes.schindelin@gmx.de>
8585
Documentation
8686
--------------
8787
Documentation by Johannes Schindelin and the git-list <git@vger.kernel.org>,
88-
with parts copied from the original documentation of RCS merge.
88+
with parts copied from the original documentation of RCS 'merge'.
8989

9090
GIT
9191
---

Documentation/git-merge-index.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ processes them in turn only stopping if merge returns a non-zero exit
4141
code.
4242

4343
Typically this is run with a script calling git's imitation of
44-
the merge command from the RCS package.
44+
the 'merge' command from the RCS package.
4545

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

Documentation/git-rerere.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
77

88
SYNOPSIS
99
--------
10-
'git rerere' [clear|diff|status|gc]
10+
'git rerere' ['clear'|'diff'|'status'|'gc']
1111

1212
DESCRIPTION
1313
-----------
@@ -49,7 +49,7 @@ conflicts. Additional arguments are passed directly to the system
4949

5050
'status'::
5151

52-
Like diff, but this only prints the filenames that will be tracked
52+
Like 'diff', but this only prints the filenames that will be tracked
5353
for resolutions.
5454

5555
'gc'::

Documentation/gitdiffcore.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gitdiffcore - Tweaking diff output (June 2005)
77

88
SYNOPSIS
99
--------
10-
git diff *
10+
'git diff' *
1111

1212
DESCRIPTION
1313
-----------
@@ -16,7 +16,7 @@ The diff commands `git-diff-index`, `git-diff-files`, and `git-diff-tree`
1616
can be told to manipulate differences they find in
1717
unconventional ways before showing `diff` output. The manipulation
1818
is collectively called "diffcore transformation". This short note
19-
describes what they are and how to use them to produce diff output
19+
describes what they are and how to use them to produce 'diff' output
2020
that is easier to understand than the conventional kind.
2121

2222

0 commit comments

Comments
 (0)