tree 0d40f7fc913c9cd303a0c3b6575393abd8380b9c
parent e68f0a4e574f38beeac513e824b685965dda31b7
parent df368fae35ce23f5b373cd567595063997bdb61c
author Junio C Hamano <gitster@pobox.com> 1601931713 -0700
committer Junio C Hamano <gitster@pobox.com> 1601931713 -0700

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()