diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:14:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:14:41 -0700 |
| commit | ebb561bcfc7f04b3122150821dde7aca0356f00c (patch) | |
| tree | 886d5b585e9260172465e6680ab522a95964eb4e /Documentation | |
| parent | c7e375de4228cdb86e2582e2eda7fa3a6f352fc2 (diff) | |
| parent | 334fba656b50c92345586970bc6b100a449e1fc5 (diff) | |
| download | git-ebb561bcfc7f04b3122150821dde7aca0356f00c.tar.gz git-ebb561bcfc7f04b3122150821dde7aca0356f00c.tar.xz | |
Merge branch 'jn/fast-import-subtree'
* jn/fast-import-subtree:
Teach fast-import to import subtrees named by tree id
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 77a0a2481..966ba4f21 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -482,9 +482,11 @@ External data format:: 'M' SP <mode> SP <dataref> SP <path> LF .... + -Here `<dataref>` can be either a mark reference (`:<idnum>`) +Here usually `<dataref>` must be either a mark reference (`:<idnum>`) set by a prior `blob` command, or a full 40-byte SHA-1 of an -existing Git blob object. +existing Git blob object. If `<mode>` is `040000`` then +`<dataref>` must be the full 40-byte SHA-1 of an existing +Git tree object or a mark reference set with `--import-marks`. Inline data format:: The data content for the file has not been supplied yet. @@ -509,6 +511,8 @@ in octal. Git only supports the following modes: * `160000`: A gitlink, SHA-1 of the object refers to a commit in another repository. Git links can only be specified by SHA or through a commit mark. They are used to implement submodules. +* `040000`: A subdirectory. Subdirectories can only be specified by + SHA or through a tree mark set with `--import-marks`. In both formats `<path>` is the complete path of the file to be added (if not already existing) or modified (if already existing). |