Git 1.6.6.3

[git.git] / Documentation / git-fast-import.txt

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index 288032c7b88f2f43a2965d5bdbffc8472f0ca281..79c5f69d421399091b7ee6f71339505edf15ce0c 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -50,6 +50,12 @@ OPTIONS
        importers may wish to lower this, such as to ensure the
        resulting packfiles fit on CDs.
 
        importers may wish to lower this, such as to ensure the
        resulting packfiles fit on CDs.
 

+--big-file-threshold=<n>::
+       Maximum size of a blob that fast-import will attempt to
+       create a delta for, expressed in bytes.  The default is 512m
+       (512 MiB).  Some importers may wish to lower this on systems
+       with constrained memory.
+

 --depth=<n>::
        Maximum delta depth, for blob and tree deltification.
        Default is 10.
 --depth=<n>::
        Maximum delta depth, for blob and tree deltification.
        Default is 10.


@@ -311,8 +317,8 @@ change to the project.
 ....
        'commit' SP <ref> LF
        mark?
 ....
        'commit' SP <ref> LF
        mark?

-       ('author' SP <name> SP LT <email> GT SP <when> LF)?
-       'committer' SP <name> SP LT <email> GT SP <when> LF
+       ('author' (SP <name>)? SP LT <email> GT SP <when> LF)?
+       'committer' (SP <name>)? SP LT <email> GT SP <when> LF

        data
        ('from' SP <committish> LF)?
        ('merge' SP <committish> LF)?
        data
        ('from' SP <committish> LF)?
        ('merge' SP <committish> LF)?


@@ -657,7 +663,7 @@ lightweight (non-annotated) tags see the `reset` command below.
 ....
        'tag' SP <name> LF
        'from' SP <committish> LF
 ....
        'tag' SP <name> LF
        'from' SP <committish> LF

-       'tagger' SP <name> SP LT <email> GT SP <when> LF
+       'tagger' (SP <name>)? SP LT <email> GT SP <when> LF

        data
 ....
 
        data
 ....