Merge branch 'jc/archive-prefix-with-add-virtual-file'
commit87f4164124d27697a83fc08ef9dbbdda6b49b839
authorJunio C Hamano <gitster@pobox.com>
Mon, 8 Jul 2024 21:53:07 +0000 (8 14:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jul 2024 21:53:07 +0000 (8 14:53 -0700)
tree1bc6b75bd766d29e5e9fc55b2b3cf2465b9ea8a7
parent5c9be4c9d6cfe32a77782116f6b66940fa19c86b
parent72c282098d27ee7252a431fc93dfe0f271242ed8
Merge branch 'jc/archive-prefix-with-add-virtual-file'

"git archive --add-virtual-file=<path>:<contents>" never paid
attention to the --prefix=<prefix> option but the documentation
said it would. The documentation has been corrected.

* jc/archive-prefix-with-add-virtual-file:
  archive: document that --add-virtual-file takes full path