From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Jul 2024 21:53:07 +0000 (-0700)
Subject: Merge branch 'jc/archive-prefix-with-add-virtual-file'
X-Git-Tag: v2.46.0-rc0~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=87f4164124d27697a83fc08ef9dbbdda6b49b839;p=thirdparty%2Fgit.git

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

87f4164124d27697a83fc08ef9dbbdda6b49b839