mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

manual: add some markup.

Browse Source 
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Ralf Wildenhues
2007-10-09 23:03:11 +02:00
committed by Shawn O. Pearce
parent 477ff5b71a
commit b6cbca3828
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/glossary.txt
View File

@ -281,7 +281,7 @@ This commit is referred to as a "merge commit", or sometimes just a
[[def_pickaxe]]pickaxe:: [[def_pickaxe]]pickaxe::
The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore The term <<def_pickaxe,pickaxe>> refers to an option to the diffcore
routines that help select changes that add or delete a given text 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 <<def_changeset,changeset>> that introduced or removed, say, a
particular line of text. See gitlink:git-diff[1]. particular line of text. See gitlink:git-diff[1].

10
Documentation/user-manual.txt
View File

@ -1536,7 +1536,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
Dangling objects are not a problem. At worst they may take up a little 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 extra disk space. They can sometimes provide a last-resort method for
recovering lost work--see <<dangling-objects>> for details. However, if 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 realize that the branch was the only reference you had to that point in
history. history.
@ -1684,7 +1684,7 @@ $ git pull
More generally, a branch that is created from a remote branch will pull More generally, a branch that is created from a remote branch will pull
by default from that branch. See the descriptions of the by default from that branch. See the descriptions of the
branch.<name>.remote and branch.<name>.merge options in 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. gitlink:git-checkout[1], to learn how to control these defaults.
In addition to saving you keystrokes, "git pull" also helps you by 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, and browse through the list of patches in the mywork branch using gitk,
applying them (possibly in a different order) to mywork-new using 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 The gitlink:git-gui[1] command may also help as it allows you to
individually select diff hunks for inclusion in the index (by individually select diff hunks for inclusion in the index (by
right-clicking on the diff hunk and choosing "Stage Hunk for Commit"). right-clicking on the diff hunk and choosing "Stage Hunk for Commit").