Documentation: clarify which parameters are optional to git-cherry

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

diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 4956964d857fd27d27fbff54de724623b79286db..0c9eb567cb3e3af89a2e2613d1e074941fa30d13 100644 (file)
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -15,7 +15,7 @@ DESCRIPTION
 This program dumps the given revisions in a form suitable to be piped
 into 'git-fast-import'.
 
 This program dumps the given revisions in a form suitable to be piped
 into 'git-fast-import'.
 

-You can use it as a human readable bundle replacement (see
+You can use it as a human-readable bundle replacement (see

 linkgit:git-bundle[1]), or as a kind of an interactive
 'git-filter-branch'.
 
 linkgit:git-bundle[1]), or as a kind of an interactive
 'git-filter-branch'.
 


@@ -36,6 +36,15 @@ when encountering a signed tag.  With 'strip', the tags will be made
 unsigned, with 'verbatim', they will be silently exported
 and with 'warn', they will be exported, but you will see a warning.
 
 unsigned, with 'verbatim', they will be silently exported
 and with 'warn', they will be exported, but you will see a warning.
 

+-M::
+-C::
+       Perform move and/or copy detection, as described in the
+       linkgit:git-diff[1] manual page, and use it to generate
+       rename and copy commands in the output dump.
++
+Note that earlier versions of this command did not complain and
+produced incorrect results if you gave these options.
+

 --export-marks=<file>::
        Dumps the internal marks table to <file> when complete.
        Marks are written one per line as `:markid SHA-1`. Only marks
 --export-marks=<file>::
        Dumps the internal marks table to <file> when complete.
        Marks are written one per line as `:markid SHA-1`. Only marks


@@ -56,6 +65,12 @@ If the backend uses a similar \--import-marks file, this allows for
 incremental bidirectional exporting of the repository by keeping the
 marks the same across runs.
 
 incremental bidirectional exporting of the repository by keeping the
 marks the same across runs.
 

+--fake-missing-tagger::
+       Some old repositories have tags without a tagger.  The
+       fast-import protocol was pretty strict about that, and did not
+       allow that.  So fake a tagger to be able to fast-import the
+       output.
+

 
 EXAMPLES
 --------
 
 EXAMPLES
 --------