From: Junio C Hamano Date: Mon, 5 Oct 2020 21:01:53 +0000 (-0700) Subject: Merge branch 'rs/archive-add-file' X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f6b06b459092520bd90e5a191589e2d4371ef7d1;p=git.git 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() --- f6b06b459092520bd90e5a191589e2d4371ef7d1