]> granicus.if.org Git - git/commitdiff
Merge branch 'en/fast-imexport-nested-tags' into next
authorJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:42:13 +0000 (11:42 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 7 Oct 2019 02:42:13 +0000 (11:42 +0900)
Updates to fast-import/export.

* en/fast-imexport-nested-tags:
  fast-export: handle nested tags
  t9350: add tests for tags of things other than a commit
  fast-export: allow user to request tags be marked with --mark-tags
  fast-export: add support for --import-marks-if-exists
  fast-import: add support for new 'alias' command
  fast-import: allow tags to be identified by mark labels
  fast-import: fix handling of deleted tags
  fast-export: fix exporting a tag and nothing else

1  2 
Documentation/git-fast-export.txt
fast-import.c

Simple merge
diff --cc fast-import.c
Simple merge