summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-10-05 14:01:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-10-05 14:01:53 -0700
commitf6b06b459092520bd90e5a191589e2d4371ef7d1 (patch)
tree0d40f7fc913c9cd303a0c3b6575393abd8380b9c /Documentation
parentMerge branch 'jt/keep-partial-clone-filter-upon-lazy-fetch' (diff)
parentMakefile: use git-archive --add-file (diff)
downloadtgif-f6b06b459092520bd90e5a191589e2d4371ef7d1.tar.xz
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()
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-archive.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index cfa1e4ebe4..9f8172828d 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -55,6 +55,12 @@ OPTIONS
--output=<file>::
Write the archive to <file> instead of stdout.
+--add-file=<file>::
+ Add a non-tracked file to the archive. Can be repeated to add
+ multiple files. The path of the file in the archive is built
+ by concatenating the value for `--prefix` (if any) and the
+ basename of <file>.
+
--worktree-attributes::
Look for attributes in .gitattributes files in the working tree
as well (see <<ATTRIBUTES>>).