diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:53 (GMT) |
| commit | f6b06b459092520bd90e5a191589e2d4371ef7d1 (patch) | |
| tree | 0d40f7fc913c9cd303a0c3b6575393abd8380b9c /Documentation | |
| parent | e68f0a4e574f38beeac513e824b685965dda31b7 (diff) | |
| parent | df368fae35ce23f5b373cd567595063997bdb61c (diff) | |
| download | git-f6b06b459092520bd90e5a191589e2d4371ef7d1.zip git-f6b06b459092520bd90e5a191589e2d4371ef7d1.tar.gz git-f6b06b459092520bd90e5a191589e2d4371ef7d1.tar.bz2 | |
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.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index cfa1e4e..9f81728 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>>). |