Merge branch 'rs/archive-add-file'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2020 21:01:53 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2020 21:01:53 +0000 (14:01 -0700)
commitf6b06b459092520bd90e5a191589e2d4371ef7d1
tree0d40f7fc913c9cd303a0c3b6575393abd8380b9c
parente68f0a4e574f38beeac513e824b685965dda31b7
parentdf368fae35ce23f5b373cd567595063997bdb61c
Merge branch 'rs/archive-add-file'

"git archive" learns the "--add-file" option to include untracked
files into a snapshot from a tree-ish.

* rs/archive-add-file:
  Makefile: use git-archive --add-file
  archive: add --add-file
  archive: read short blobs in archive.c::write_archive_entry()
Makefile