Merge branch 'jc/makefile'

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

diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 073ff7f123d633358f57d9995d23da14da81df77..6dac475a0be0a259895e6407279689dffb6b5708 100644 (file)
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -13,27 +13,27 @@ SYNOPSIS
 DESCRIPTION
 -----------
 This program dumps the given revisions in a form suitable to be piped
 DESCRIPTION
 -----------
 This program dumps the given revisions in a form suitable to be piped

-into gitlink:git-fast-import[1].
+into linkgit:git-fast-import[1].

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

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

 
 
 OPTIONS
 -------
 --progress=<n>::
        Insert 'progress' statements every <n> objects, to be shown by
 
 
 OPTIONS
 -------
 --progress=<n>::
        Insert 'progress' statements every <n> objects, to be shown by

-       gitlink:git-fast-import[1] during import.
+       linkgit:git-fast-import[1] during import.

 
 

---signed-tags=(ignore|warn|strip|abort)::
+--signed-tags=(verbatim|warn|strip|abort)::

        Specify how to handle signed tags.  Since any transformation
        after the export can change the tag names (which can also happen
        when excluding revisions) the signatures will not match.
 +
 When asking to 'abort' (which is the default), this program will die
 when encountering a signed tag.  With 'strip', the tags will be made
        Specify how to handle signed tags.  Since any transformation
        after the export can change the tag names (which can also happen
        when excluding revisions) the signatures will not match.
 +
 When asking to 'abort' (which is the default), this program will die
 when encountering a signed tag.  With 'strip', the tags will be made

-unsigned, with 'ignore', they will be silently ignored (i.e. not exported)
+unsigned, with 'verbatim', they will be silently exported

 and with 'warn', they will be exported, but you will see a warning.
 
 
 and with 'warn', they will be exported, but you will see a warning.
 
 


@@ -65,7 +65,7 @@ referenced by that revision range contains the string
 Limitations
 -----------
 
 Limitations
 -----------
 

-Since gitlink:git-fast-import[1] cannot tag trees, you will not be
+Since linkgit:git-fast-import[1] cannot tag trees, you will not be

 able to export the linux-2.6.git repository completely, as it contains
 a tag referencing a tree instead of a commit.
 
 able to export the linux-2.6.git repository completely, as it contains
 a tag referencing a tree instead of a commit.
 


@@ -80,4 +80,4 @@ Documentation by Johannes E. Schindelin <johannes.schindelin@gmx.de>.
 
 GIT
 ---
 
 GIT
 ---

-Part of the gitlink:git[7] suite
+Part of the linkgit:git[7] suite