diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-15 14:24:40 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-15 14:24:40 +0900 |
| commit | fa2a48b86c2f25f536c882f5cf012000e38315c3 (patch) | |
| tree | fa99033a1dad567ae85b6ad3ea4627375adf217f /git-fast-import.txt | |
| parent | 6c6b0e5a189ca5f922b8d1535d0795a34176a1a1 (diff) | |
| download | git-htmldocs-fa2a48b86c2f25f536c882f5cf012000e38315c3.tar.gz | |
Autogenerated HTML docs for v2.23.0-715-g108b9
Diffstat (limited to 'git-fast-import.txt')
| -rw-r--r-- | git-fast-import.txt | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/git-fast-import.txt b/git-fast-import.txt index 0bb276269..a3f1e0c5e 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -337,6 +337,13 @@ and control the current import process. More detailed discussion `commit` command. This command is optional and is not needed to perform an import. +`alias`:: + Record that a mark refers to a given object without first + creating any new object. Using --import-marks and referring + to missing marks will cause fast-import to fail, so aliases + can provide a way to set otherwise pruned commits to a valid + value (e.g. the nearest non-pruned ancestor). + `checkpoint`:: Forces fast-import to close the current packfile, generate its unique SHA-1 checksum and index, and start a new packfile. @@ -774,6 +781,7 @@ lightweight (non-annotated) tags see the `reset` command below. .... 'tag' SP <name> LF + mark? 'from' SP <commit-ish> LF original-oid? 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF @@ -913,6 +921,21 @@ a data chunk which does not have an LF as its last byte. + The `LF` after `<delim> LF` is optional (it used to be required). +`alias` +~~~~~~~ +Record that a mark refers to a given object without first creating any +new object. + +.... + 'alias' LF + mark + 'to' SP <commit-ish> LF + LF? +.... + +For a detailed description of `<commit-ish>` see above under `from`. + + `checkpoint` ~~~~~~~~~~~~ Forces fast-import to close the current packfile, start a new one, and to |