git.99rst.org Git - git.git/commit

author	Junio C Hamano <redacted>
	Tue, 15 Oct 2019 04:48:00 +0000 (13:48 +0900)
committer	Junio C Hamano <redacted>
	Tue, 15 Oct 2019 04:48:00 +0000 (13:48 +0900)
commit	16d9d7184bbf39e8c1c9c4756805278f530be30f
tree	afd37dd3c8734d1488e58b8da1b575b3d0de6034	tree
parent	6d5291be450594d453759650f466174f39953c4f	commit \| diff
parent	941790d7de6268ba22258bdfb4d0a9ade9390e19	commit \| diff

Merge branch 'en/fast-imexport-nested-tags'

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

Documentation/git-fast-export.txt	diff1 \|	diff2 \|	blob \| history
fast-import.c	diff1 \|	diff2 \|	blob \| history
t/t9300-fast-import.sh	diff1 \|	diff2 \|	blob \| history