Skip to content

Commit b6cbca3

Browse files
Ralf Wildenhuesspearce
authored andcommitted
manual: add some markup.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
1 parent 477ff5b commit b6cbca3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Documentation/glossary.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ This commit is referred to as a "merge commit", or sometimes just a
281281
[[def_pickaxe]]pickaxe::
282282
The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore
283283
routines that help select changes that add or delete a given text
284-
string. With the --pickaxe-all option, it can be used to view the full
284+
string. With the `--pickaxe-all` option, it can be used to view the full
285285
<<def_changeset,changeset>> that introduced or removed, say, a
286286
particular line of text. See gitlink:git-diff[1].
287287

Documentation/user-manual.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1536,7 +1536,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
15361536
Dangling objects are not a problem. At worst they may take up a little
15371537
extra disk space. They can sometimes provide a last-resort method for
15381538
recovering lost work--see <<dangling-objects>> for details. However, if
1539-
you wish, you can remove them with gitlink:git-prune[1] or the --prune
1539+
you wish, you can remove them with gitlink:git-prune[1] or the `--prune`
15401540
option to gitlink:git-gc[1]:
15411541

15421542
-------------------------------------------------
@@ -1555,7 +1555,7 @@ Recovering lost changes
15551555
Reflogs
15561556
^^^^^^^
15571557

1558-
Say you modify a branch with gitlink:git-reset[1] --hard, and then
1558+
Say you modify a branch with `gitlink:git-reset[1] --hard`, and then
15591559
realize that the branch was the only reference you had to that point in
15601560
history.
15611561

@@ -1684,7 +1684,7 @@ $ git pull
16841684
More generally, a branch that is created from a remote branch will pull
16851685
by default from that branch. See the descriptions of the
16861686
branch.<name>.remote and branch.<name>.merge options in
1687-
gitlink:git-config[1], and the discussion of the --track option in
1687+
gitlink:git-config[1], and the discussion of the `--track` option in
16881688
gitlink:git-checkout[1], to learn how to control these defaults.
16891689

16901690
In addition to saving you keystrokes, "git pull" also helps you by
@@ -2412,7 +2412,7 @@ $ git rebase --continue
24122412

24132413
and git will continue applying the rest of the patches.
24142414

2415-
At any point you may use the --abort option to abort this process and
2415+
At any point you may use the `--abort` option to abort this process and
24162416
return mywork to the state it had before you started the rebase:
24172417

24182418
-------------------------------------------------
@@ -2481,7 +2481,7 @@ $ gitk origin..mywork &
24812481

24822482
and browse through the list of patches in the mywork branch using gitk,
24832483
applying them (possibly in a different order) to mywork-new using
2484-
cherry-pick, and possibly modifying them as you go using commit --amend.
2484+
cherry-pick, and possibly modifying them as you go using `commit --amend`.
24852485
The gitlink:git-gui[1] command may also help as it allows you to
24862486
individually select diff hunks for inclusion in the index (by
24872487
right-clicking on the diff hunk and choosing "Stage Hunk for Commit").

0 commit comments

Comments
 (0)