Document fast-import.

diff --git a/src b/src
index 27ba5f9a7a9c29a3256fecb3dda2bf82bedb79dc..83ced1b99490bfec8d9e2901a496d8549bbb089a 100755 (executable)
--- a/src
+++ b/src
@@ -272,6 +272,7 @@ log         -- the log command: dump commit log information to standard output.
 list        -- the list command: dump commit summaries to standard output.
 diff        -- the diff command: dump revision differences to standard output.
 fast-export -- the fast-export command: export history to other systems.
+fast-import -- the fast-import command: import history from other systems.
 ignores     -- .srcignore files and their uses.
 """,
     "intro": """
@@ -405,7 +406,7 @@ src fast-export ['revision-range'] ['file'...]
 
 src fast-import [-p] ['file'...]
    Parse a git-fast-import stream from standard input. The modifications for
-   each individual file become a SRC history.  Mark, committer and
+   each individual file become separate SRC histories.  Mark, committer and
    author data, and mark cross-references to parent commits, are preserved
    in RFC-822-style headers on log comments unless the -p (plain) option
    is given, in which case this metadata is discarded. Give arguments to
@@ -593,6 +594,24 @@ history.
 The committer identification is copied from your Git configuration.
 
 The default range is all commits.
+""",   
+   "fast-import" : """
+src fast-import [-p] ['file'...]
+
+Parse a git-fast-import stream from standard input. The modifications
+for each individual file become separate SRC histories. Give arguments
+to restrict the files imported.
+
+The import is actually done with the rcs-fast-import(1) tool, which
+must be on your $PATH for this command to work.
+
+Some gitspace metadata cannot be represented in the SRC/RCS model of
+version control. Mark, committer and author data, and mark
+cross-references to parent commits. These are preserved in
+RFC-822-style headers on log comments unless the -p (plain) option is
+given, in which case this metadata is discarded.
+
+This command is not expected to be very useful.  
 """,   
    "ignores" : """
 You can have a file named .srcignore containing the names of files that

diff --git a/src.asc b/src.asc
index a2da0563b207fbc73b04f120cda31ee907aee934..2650f3215dc3fa9f38240750e67c586e91685a9e 100644 (file)
--- a/src.asc
+++ b/src.asc
@@ -117,7 +117,7 @@ src fast-export ['revision-range'] ['file'...]::
 
 src fast-import [-p] ['files'...]::
    Parse a git-fast-import stream from standard input. The modifications for
-   each individual file become a SRC history.  Mark, committer and
+   each individual file become separate SRC histories.  Mark, committer and
    author data, and mark cross-references to parent commits, are preserved
    in RFC-822-style headers on log comments unless the -p (plain) option
    is given, in which case this metadata is discarded. Give arguments