summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-02-08 01:35:37 -0500
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-02-08 01:35:37 -0500
commit209f129857bddd653e4ea2af2d310cbb8d8c8b5f (patch)
treec8a963ac460e3cfc944566b37c12a5e816d0a913
parentAdd a Tips and Tricks section to fast-import's manual. (diff)
downloadtgif-209f129857bddd653e4ea2af2d310cbb8d8c8b5f.tar.xz
Correct ^0 asciidoc syntax in fast-import docs.
I wrote this documentation with asciidoc 7.1.2, but apparently asciidoc 8 assumes ^ means superscript. The solution was already documented in rev-parse's manpage and is to use {caret} instead. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--Documentation/git-fast-import.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 0b64d3348b..0c4476109d 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -380,9 +380,9 @@ current branch value should be written as:
----
from refs/heads/branch^0
----
-The `^0` suffix is necessary as gfi does not permit a branch to
+The `{caret}0` suffix is necessary as gfi does not permit a branch to
start from itself, and the branch is created in memory before the
-`from` command is even read from the input. Adding `^0` will force
+`from` command is even read from the input. Adding `{caret}0` will force
gfi to resolve the commit through Git's revision parsing library,
rather than its internal branch table, thereby loading in the
existing value of the branch.