Skip to content

Commit ca76828

Browse files
committed
Documentation: format full commands in typewriter font
Use `code snippet` style instead of 'emphasis' for `git cmd ...` according to the following rules: * The SYNOPSIS sections are left untouched. * If the intent is that the user type the command exactly as given, it is `code`. If the user is only loosely referred to a command and/or option, it remains 'emphasised'. Signed-off-by: Thomas Rast <trast@student.ethz.ch>
1 parent e330d8c commit ca76828

File tree

12 files changed

+28
-28
lines changed

12 files changed

+28
-28
lines changed

Documentation/config.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,15 +741,15 @@ diff.mnemonicprefix::
741741
standard "a/" and "b/" depending on what is being compared. When
742742
this configuration is in effect, reverse diff output also swaps
743743
the order of the prefixes:
744-
'git-diff';;
744+
`git diff`;;
745745
compares the (i)ndex and the (w)ork tree;
746-
'git-diff HEAD';;
746+
`git diff HEAD`;;
747747
compares a (c)ommit and the (w)ork tree;
748-
'git diff --cached';;
748+
`git diff --cached`;;
749749
compares a (c)ommit and the (i)ndex;
750-
'git-diff HEAD:file1 file2';;
750+
`git diff HEAD:file1 file2`;;
751751
compares an (o)bject and a (w)ork tree entity;
752-
'git diff --no-index a b';;
752+
`git diff --no-index a b`;;
753753
compares two non-git things (1) and (2).
754754

755755
diff.renameLimit::
@@ -1015,7 +1015,7 @@ gui.spellingdictionary::
10151015
off.
10161016

10171017
gui.fastcopyblame::
1018-
If true, 'git gui blame' uses '-C' instead of '-C -C' for original
1018+
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
10191019
location detection. It makes blame significantly faster on huge
10201020
repositories at the expense of less thorough copy detection.
10211021

Documentation/git-add.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ The `git add` command will not add ignored files by default. If any
3939
ignored files were explicitly specified on the command line, `git add`
4040
will fail with a list of ignored files. Ignored files reached by
4141
directory recursion or filename globbing performed by Git (quote your
42-
globs before the shell) will be silently ignored. The `add` command can
42+
globs before the shell) will be silently ignored. The 'git add' command can
4343
be used to add ignored files with the `-f` (force) option.
4444

4545
Please see linkgit:git-commit[1] for alternative ways to add content to a

Documentation/git-cvsserver.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ To get a checkout with the Eclipse CVS client:
294294
Protocol notes: If you are using anonymous access via pserver, just select that.
295295
Those using SSH access should choose the 'ext' protocol, and configure 'ext'
296296
access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to
297-
"'git cvsserver'". Note that password support is not good when using 'ext',
297+
"`git cvsserver`". Note that password support is not good when using 'ext',
298298
you will definitely want to have SSH keys setup.
299299

300300
Alternatively, you can just use the non-standard extssh protocol that Eclipse

Documentation/git-filter-branch.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ convenience functions, too. For example, calling 'skip_commit "$@"'
129129
will leave out the current commit (but not its changes! If you want
130130
that, use 'git-rebase' instead).
131131
+
132-
You can also use the 'git_commit_non_empty_tree "$@"' instead of
133-
'git commit-tree "$@"' if you don't wish to keep commits with a single parent
132+
You can also use the `git_commit_non_empty_tree "$@"` instead of
133+
`git commit-tree "$@"` if you don't wish to keep commits with a single parent
134134
and that makes no change to the tree.
135135

136136
--tag-name-filter <command>::
@@ -179,7 +179,7 @@ the nearest ancestor that was not excluded.
179179
and only one parent, it will hence keep merges points. Also, this
180180
option is not compatible with the use of '--commit-filter'. Though you
181181
just need to use the function 'git_commit_non_empty_tree "$@"' instead
182-
of the 'git commit-tree "$@"' idiom in your commit filter to make that
182+
of the `git commit-tree "$@"` idiom in your commit filter to make that
183183
happen.
184184

185185
--original <namespace>::

Documentation/git-gc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Housekeeping is required if there are too many loose objects or
5050
too many packs in the repository. If the number of loose objects
5151
exceeds the value of the `gc.auto` configuration variable, then
5252
all loose objects are combined into a single pack using
53-
'git-repack -d -l'. Setting the value of `gc.auto` to 0
53+
`git-repack -d -l`. Setting the value of `gc.auto` to 0
5454
disables automatic packing of loose objects.
5555
+
5656
If the number of packs exceeds the value of `gc.autopacklimit`,

Documentation/git-ls-tree.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ in the current working directory. Note that:
2828
in a directory 'sub' that has a directory 'dir', you can run 'git
2929
ls-tree -r HEAD dir' to list the contents of the tree (that is
3030
'sub/dir' in 'HEAD'). You don't want to give a tree that is not at the
31-
root level (e.g. 'git ls-tree -r HEAD:sub dir') in this case, as that
31+
root level (e.g. `git ls-tree -r HEAD:sub dir`) in this case, as that
3232
would result in asking for 'sub/sub/dir' in the 'HEAD' commit.
3333
However, the current working directory can be ignored by passing
3434
--full-tree option.
@@ -84,7 +84,7 @@ Output Format
8484

8585
Unless the `-z` option is used, TAB, LF, and backslash characters
8686
in pathnames are represented as `\t`, `\n`, and `\\`, respectively.
87-
This output format is compatible with what '--index-info --stdin' of
87+
This output format is compatible with what `--index-info --stdin` of
8888
'git update-index' expects.
8989

9090
When the `-l` option is used, format changes to

Documentation/git-merge.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ After seeing a conflict, you can do two things:
193193

194194
* Decide not to merge. The only clean-ups you need are to reset
195195
the index file to the `HEAD` commit to reverse 2. and to clean
196-
up working tree changes made by 2. and 3.; 'git-reset --hard' can
196+
up working tree changes made by 2. and 3.; `git-reset --hard` can
197197
be used for this.
198198

199199
* Resolve the conflicts. Git will mark the conflicts in
@@ -202,19 +202,19 @@ After seeing a conflict, you can do two things:
202202

203203
You can work through the conflict with a number of tools:
204204

205-
* Use a mergetool. 'git mergetool' to launch a graphical
205+
* Use a mergetool. `git mergetool` to launch a graphical
206206
mergetool which will work you through the merge.
207207

208-
* Look at the diffs. 'git diff' will show a three-way diff,
208+
* Look at the diffs. `git diff` will show a three-way diff,
209209
highlighting changes from both the HEAD and their versions.
210210

211-
* Look at the diffs on their own. 'git log --merge -p <path>'
211+
* Look at the diffs on their own. `git log --merge -p <path>`
212212
will show diffs first for the HEAD version and then
213213
their version.
214214

215-
* Look at the originals. 'git show :1:filename' shows the
216-
common ancestor, 'git show :2:filename' shows the HEAD
217-
version and 'git show :3:filename' shows their version.
215+
* Look at the originals. `git show :1:filename` shows the
216+
common ancestor, `git show :2:filename` shows the HEAD
217+
version and `git show :3:filename` shows their version.
218218

219219

220220
EXAMPLES

Documentation/git-replace.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ OPTIONS
6565
BUGS
6666
----
6767
Comparing blobs or trees that have been replaced with those that
68-
replace them will not work properly. And using 'git reset --hard' to
68+
replace them will not work properly. And using `git reset --hard` to
6969
go back to a replaced commit will move the branch to the replacement
7070
commit instead of the replaced commit.
7171

Documentation/git-revert.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ effect of an earlier commit (often a faulty one). If you want to
2020
throw away all uncommitted changes in your working directory, you
2121
should see linkgit:git-reset[1], particularly the '--hard' option. If
2222
you want to extract specific files as they were in another commit, you
23-
should see linkgit:git-checkout[1], specifically the 'git checkout
24-
<commit> -- <filename>' syntax. Take care with these alternatives as
23+
should see linkgit:git-checkout[1], specifically the `git checkout
24+
<commit> -- <filename>` syntax. Take care with these alternatives as
2525
both will discard uncommitted changes in your working directory.
2626

2727
OPTIONS

Documentation/git-stash.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SYNOPSIS
2020
DESCRIPTION
2121
-----------
2222

23-
Use 'git stash' when you want to record the current state of the
23+
Use `git stash` when you want to record the current state of the
2424
working directory and the index, but want to go back to a clean
2525
working directory. The command saves your local modifications away
2626
and reverts the working directory to match the `HEAD` commit.

0 commit comments

Comments
 (0)