manual: add some markup.
Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Ralf Wildenhues committed
Oct 9, 2007 at 23:03 UTC
b6cbca38287668095c0025fcf33b126f5efb9071
2 files changed
+6
-6
Documentation/glossary.txt
+1
-1
@@ -281,7 +281,7 @@ This commit is referred to as a "merge commit", or sometimes just a
281
[[def_pickaxe]]pickaxe::
282
The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore
283
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
285
<<def_changeset,changeset>> that introduced or removed, say, a
286
particular line of text. See gitlink:git-diff[1].
287
Documentation/user-manual.txt
+5
-5
@@ -1536,7 +1536,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
1536
Dangling objects are not a problem. At worst they may take up a little
1537
extra disk space. They can sometimes provide a last-resort method for
1538
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`
1540
option to gitlink:git-gc[1]:
1541
1542
-------------------------------------------------
@@ -1555,7 +1555,7 @@ Recovering lost changes
1555
Reflogs
1556
^^^^^^^
1557
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
1559
realize that the branch was the only reference you had to that point in
1560
history.
1561
@@ -1684,7 +1684,7 @@ $ git pull
1684
More generally, a branch that is created from a remote branch will pull
1685
by default from that branch. See the descriptions of the
1686
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
1688
gitlink:git-checkout[1], to learn how to control these defaults.
1689
1690
In addition to saving you keystrokes, "git pull" also helps you by
@@ -2412,7 +2412,7 @@ $ git rebase --continue
2412
2413
and git will continue applying the rest of the patches.
2414
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
2416
return mywork to the state it had before you started the rebase:
2417
2418
-------------------------------------------------
@@ -2481,7 +2481,7 @@ $ gitk origin..mywork &
2481
2482
and browse through the list of patches in the mywork branch using gitk,
2483
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`.
2485
The gitlink:git-gui[1] command may also help as it allows you to
2486
individually select diff hunks for inclusion in the index (by
2487
right-clicking on the diff hunk and choosing "Stage Hunk for Commit").