tree f089f52a13268fe0cb53ef450f535bd5d4a99a70
parent cde555480b95c4311819dc1f7a38cc856a9aed23
parent a965bb31166d04f3e5c8f7a93569fb73f9a9d749
author Junio C Hamano <gitster@pobox.com> 1546637613 -0800
committer Junio C Hamano <gitster@pobox.com> 1546637613 -0800

Merge branch 'en/fast-export-import'

Small fixes and features for fast-export and fast-import, mostly on
the fast-export side.

* en/fast-export-import:
  fast-export: add a --show-original-ids option to show original names
  fast-import: remove unmaintained duplicate documentation
  fast-export: add --reference-excluded-parents option
  fast-export: ensure we export requested refs
  fast-export: when using paths, avoid corrupt stream with non-existent mark
  fast-export: move commit rewriting logic into a function for reuse
  fast-export: avoid dying when filtering by paths and old tags exist
  fast-export: use value from correct enum
  git-fast-export.txt: clarify misleading documentation about rev-list args
  git-fast-import.txt: fix documentation for --quiet option
  fast-export: convert sha1 to oid