manual: add some markup.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/Documentation/glossary.txt b/Documentation/glossary.txt
index 56451775e70e313311ac0cfbc286fa262eb15d5c..fc1874424e26a2f95574d72bf3fc1c71a3b1a1b6 100644 (file)
--- a/Documentation/glossary.txt
+++ b/Documentation/glossary.txt
@@ -281,7 +281,7 @@ This commit is referred to as a "merge commit", or sometimes just a
 [[def_pickaxe]]pickaxe::
        The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore
        routines that help select changes that add or delete a given text
 [[def_pickaxe]]pickaxe::
        The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore
        routines that help select changes that add or delete a given text

-       string. With the --pickaxe-all option, it can be used to view the full
+       string. With the `--pickaxe-all` option, it can be used to view the full

        <<def_changeset,changeset>> that introduced or removed, say, a
        particular line of text. See gitlink:git-diff[1].
 
        <<def_changeset,changeset>> that introduced or removed, say, a
        particular line of text. See gitlink:git-diff[1].
 

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 93d20f8a2bfea50c5cdfc036acaf62fabe389007..64544f21e0c39cb4d835ee1c4047a7ba275338ca 100644 (file)
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1536,7 +1536,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
 Dangling objects are not a problem.  At worst they may take up a little
 extra disk space.  They can sometimes provide a last-resort method for
 recovering lost work--see <<dangling-objects>> for details.  However, if
 Dangling objects are not a problem.  At worst they may take up a little
 extra disk space.  They can sometimes provide a last-resort method for
 recovering lost work--see <<dangling-objects>> for details.  However, if

-you wish, you can remove them with gitlink:git-prune[1] or the --prune
+you wish, you can remove them with gitlink:git-prune[1] or the `--prune`

 option to gitlink:git-gc[1]:
 
 -------------------------------------------------
 option to gitlink:git-gc[1]:
 
 -------------------------------------------------


@@ -1555,7 +1555,7 @@ Recovering lost changes
 Reflogs
 ^^^^^^^
 
 Reflogs
 ^^^^^^^
 

-Say you modify a branch with gitlink:git-reset[1] --hard, and then
+Say you modify a branch with `gitlink:git-reset[1] --hard`, and then

 realize that the branch was the only reference you had to that point in
 history.
 
 realize that the branch was the only reference you had to that point in
 history.
 


@@ -1684,7 +1684,7 @@ $ git pull
 More generally, a branch that is created from a remote branch will pull
 by default from that branch.  See the descriptions of the
 branch.<name>.remote and branch.<name>.merge options in
 More generally, a branch that is created from a remote branch will pull
 by default from that branch.  See the descriptions of the
 branch.<name>.remote and branch.<name>.merge options in

-gitlink:git-config[1], and the discussion of the --track option in
+gitlink:git-config[1], and the discussion of the `--track` option in

 gitlink:git-checkout[1], to learn how to control these defaults.
 
 In addition to saving you keystrokes, "git pull" also helps you by
 gitlink:git-checkout[1], to learn how to control these defaults.
 
 In addition to saving you keystrokes, "git pull" also helps you by


@@ -2412,7 +2412,7 @@ $ git rebase --continue
 
 and git will continue applying the rest of the patches.
 
 
 and git will continue applying the rest of the patches.
 

-At any point you may use the --abort option to abort this process and
+At any point you may use the `--abort` option to abort this process and

 return mywork to the state it had before you started the rebase:
 
 -------------------------------------------------
 return mywork to the state it had before you started the rebase:
 
 -------------------------------------------------


@@ -2481,7 +2481,7 @@ $ gitk origin..mywork &
 
 and browse through the list of patches in the mywork branch using gitk,
 applying them (possibly in a different order) to mywork-new using
 
 and browse through the list of patches in the mywork branch using gitk,
 applying them (possibly in a different order) to mywork-new using

-cherry-pick, and possibly modifying them as you go using commit --amend.
+cherry-pick, and possibly modifying them as you go using `commit --amend`.

 The gitlink:git-gui[1] command may also help as it allows you to
 individually select diff hunks for inclusion in the index (by
 right-clicking on the diff hunk and choosing "Stage Hunk for Commit").
 The gitlink:git-gui[1] command may also help as it allows you to
 individually select diff hunks for inclusion in the index (by
 right-clicking on the diff hunk and choosing "Stage Hunk for Commit").