diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-07-26 11:23:52 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-07-26 11:23:52 -0700 |
| commit | feab68cd91439cb9eef26f7197ac857da1238a49 (patch) | |
| tree | d917cc66d7183d7a88d110d12d1241a53a78eaca /Documentation | |
| parent | d8f7be2ebcb7e3ec40269080a9ab9a28bc06ba17 (diff) | |
| parent | 8af15d282e59a7f566b5e7eb71caebfc40ca5cd6 (diff) | |
| download | git-feab68cd91439cb9eef26f7197ac857da1238a49.tar.gz git-feab68cd91439cb9eef26f7197ac857da1238a49.tar.xz | |
Merge branch 'en/fast-export'
* en/fast-export:
fast-export: Document the fact that git-rev-list arguments are accepted
Add new fast-export testcases
fast-export: Add a --tag-of-filtered-object option for newly dangling tags
fast-export: Do parent rewriting to avoid dropping relevant commits
fast-export: Make sure we show actual ref names instead of "(null)"
fast-export: Omit tags that tag trees
fast-export: Set revs.topo_order before calling setup_revisions
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-export.txt | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt index 0c9eb567c..af2328d40 100644 --- a/Documentation/git-fast-export.txt +++ b/Documentation/git-fast-export.txt @@ -36,6 +36,17 @@ 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. +--tag-of-filtered-object=(abort|drop|rewrite):: + Specify how to handle tags whose tagged objectis filtered out. + Since revisions and files to export can be limited by path, + tagged objects may be filtered completely. ++ +When asking to 'abort' (which is the default), this program will die +when encountering such a tag. With 'drop' it will omit such tags from +the output. With 'rewrite', if the tagged object is a commit, it will +rewrite the tag to tag an ancestor commit (via parent rewriting; see +linkgit:git-rev-list[1]) + -M:: -C:: Perform move and/or copy detection, as described in the @@ -71,6 +82,12 @@ marks the same across runs. allow that. So fake a tagger to be able to fast-import the output. +[git-rev-list-args...]:: + A list of arguments, acceptable to 'git-rev-parse' and + 'git-rev-list', that specifies the specific objects and references + to export. For example, `master\~10..master` causes the + current master reference to be exported along with all objects + added since its 10th ancestor commit. EXAMPLES -------- |