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 /git-merge-octopus.sh | |
| parent | GIT 1.6.4-rc3 (diff) | |
| parent | fast-export: Document the fact that git-rev-list arguments are accepted (diff) | |
| download | tgif-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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions