i18n: git-revert "Your local changes" message

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

diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index f56dfcabb96d1510abfd61a13c36135f3824b744..c3a2766b206609bb5f313db3ff37a1ebb40f8261 100644 (file)
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -78,6 +78,10 @@ OPTIONS
        set of marks.  If a mark is defined to different values,
        the last file wins.
 
        set of marks.  If a mark is defined to different values,
        the last file wins.
 

+--import-marks-if-exists=<file>::
+       Like --import-marks but instead of erroring out, silently
+       skips the file if it does not exist.
+

 --relative-marks::
        After specifying --relative-marks= the paths specified
        with --import-marks= and --export-marks= are relative
 --relative-marks::
        After specifying --relative-marks= the paths specified
        with --import-marks= and --export-marks= are relative


@@ -534,9 +538,6 @@ start with double quote (`"`).
 If an `LF` or double quote must be encoded into `<path>` shell-style
 quoting should be used, e.g. `"path/with\n and \" in it"`.
 
 If an `LF` or double quote must be encoded into `<path>` shell-style
 quoting should be used, e.g. `"path/with\n and \" in it"`.
 

-Additionally, in `040000` mode, `<path>` may also be an empty string
-(`""`) to specify the root of the tree.
-

 The value of `<path>` must be in canonical form. That is it must not:
 
 * contain an empty directory component (e.g. `foo//bar` is invalid),
 The value of `<path>` must be in canonical form. That is it must not:
 
 * contain an empty directory component (e.g. `foo//bar` is invalid),


@@ -545,6 +546,8 @@ The value of `<path>` must be in canonical form. That is it must not:
 * contain the special component `.` or `..` (e.g. `foo/./bar` and
   `foo/../bar` are invalid).
 
 * contain the special component `.` or `..` (e.g. `foo/./bar` and
   `foo/../bar` are invalid).
 

+The root of the tree can be represented by an empty string as `<path>`.
+

 It is recommended that `<path>` always be encoded using UTF-8.
 
 `filedelete`
 It is recommended that `<path>` always be encoded using UTF-8.
 
 `filedelete`


@@ -905,7 +908,7 @@ The `<dataref>` can be either a mark reference (`:<idnum>`)
 set previously or a full 40-byte SHA-1 of a Git blob, preexisting or
 ready to be written.
 
 set previously or a full 40-byte SHA-1 of a Git blob, preexisting or
 ready to be written.
 

-output uses the same format as `git cat-file --batch`:
+Output uses the same format as `git cat-file --batch`:

 
 ====
        <sha1> SP 'blob' SP <size> LF
 
 ====
        <sha1> SP 'blob' SP <size> LF


@@ -949,6 +952,13 @@ cat-blob::
        rather than wasting time on the early part of an import
        before the unsupported command is detected.
 
        rather than wasting time on the early part of an import
        before the unsupported command is detected.
 

+notes::
+       Require that the backend support the 'notemodify' (N)
+       subcommand to the 'commit' command.
+       Versions of fast-import not supporting notes will exit
+       with a message indicating so.
+
+

 `option`
 ~~~~~~~~
 Processes the specified option so that git fast-import behaves in a
 `option`
 ~~~~~~~~
 Processes the specified option so that git fast-import behaves in a