1git-fast-import(1) 2================== 3 4NAME 5---- 6git-fast-import - Backend for fast Git data importers 7 8 9SYNOPSIS 10-------- 11[verse] 12frontend | 'git fast-import' [options] 13 14DESCRIPTION 15----------- 16This program is usually not what the end user wants to run directly. 17Most end users want to use one of the existing frontend programs, 18which parses a specific type of foreign source and feeds the contents 19stored there to 'git fast-import'. 20 21fast-import reads a mixed command/data stream from standard input and 22writes one or more packfiles directly into the current repository. 23When EOF is received on standard input, fast import writes out 24updated branch and tag refs, fully updating the current repository 25with the newly imported data. 26 27The fast-import backend itself can import into an empty repository (one that 28has already been initialized by 'git init') or incrementally 29update an existing populated repository. Whether or not incremental 30imports are supported from a particular foreign source depends on 31the frontend program in use. 32 33 34OPTIONS 35------- 36--date-format=<fmt>:: 37 Specify the type of dates the frontend will supply to 38 fast-import within `author`, `committer` and `tagger` commands. 39 See ``Date Formats'' below for details about which formats 40 are supported, and their syntax. 41 42-- done:: 43 Terminate with error if there is no 'done' command at the 44 end of the stream. 45 46--force:: 47 Force updating modified existing branches, even if doing 48 so would cause commits to be lost (as the new commit does 49 not contain the old commit). 50 51--max-pack-size=<n>:: 52 Maximum size of each output packfile. 53 The default is unlimited. 54 55--big-file-threshold=<n>:: 56 Maximum size of a blob that fast-import will attempt to 57 create a delta for, expressed in bytes. The default is 512m 58 (512 MiB). Some importers may wish to lower this on systems 59 with constrained memory. 60 61--depth=<n>:: 62 Maximum delta depth, for blob and tree deltification. 63 Default is 10. 64 65--active-branches=<n>:: 66 Maximum number of branches to maintain active at once. 67 See ``Memory Utilization'' below for details. Default is 5. 68 69--export-marks=<file>:: 70 Dumps the internal marks table to <file> when complete. 71 Marks are written one per line as `:markid SHA-1`. 72 Frontends can use this file to validate imports after they 73 have been completed, or to save the marks table across 74 incremental runs. As <file> is only opened and truncated 75 at checkpoint (or completion) the same path can also be 76 safely given to \--import-marks. 77 78--import-marks=<file>:: 79 Before processing any input, load the marks specified in 80 <file>. The input file must exist, must be readable, and 81 must use the same format as produced by \--export-marks. 82 Multiple options may be supplied to import more than one 83 set of marks. If a mark is defined to different values, 84 the last file wins. 85 86--import-marks-if-exists=<file>:: 87 Like --import-marks but instead of erroring out, silently 88 skips the file if it does not exist. 89 90--relative-marks:: 91 After specifying --relative-marks the paths specified 92 with --import-marks= and --export-marks= are relative 93 to an internal directory in the current repository. 94 In git-fast-import this means that the paths are relative 95 to the .git/info/fast-import directory. However, other 96 importers may use a different location. 97 98--no-relative-marks:: 99 Negates a previous --relative-marks. Allows for combining 100 relative and non-relative marks by interweaving 101 --(no-)-relative-marks with the --(import|export)-marks= 102 options. 103 104--cat-blob-fd=<fd>:: 105 Write responses to `cat-blob` and `ls` queries to the 106 file descriptor <fd> instead of `stdout`. Allows `progress` 107 output intended for the end-user to be separated from other 108 output. 109 110--done:: 111 Require a `done` command at the end of the stream. 112 This option might be useful for detecting errors that 113 cause the frontend to terminate before it has started to 114 write a stream. 115 116--export-pack-edges=<file>:: 117 After creating a packfile, print a line of data to 118 <file> listing the filename of the packfile and the last 119 commit on each branch that was written to that packfile. 120 This information may be useful after importing projects 121 whose total object set exceeds the 4 GiB packfile limit, 122 as these commits can be used as edge points during calls 123 to 'git pack-objects'. 124 125--quiet:: 126 Disable all non-fatal output, making fast-import silent when it 127 is successful. This option disables the output shown by 128 \--stats. 129 130--stats:: 131 Display some basic statistics about the objects fast-import has 132 created, the packfiles they were stored into, and the 133 memory used by fast-import during this run. Showing this output 134 is currently the default, but can be disabled with \--quiet. 135 136 137Performance 138----------- 139The design of fast-import allows it to import large projects in a minimum 140amount of memory usage and processing time. Assuming the frontend 141is able to keep up with fast-import and feed it a constant stream of data, 142import times for projects holding 10+ years of history and containing 143100,000+ individual commits are generally completed in just 1-2 144hours on quite modest (~$2,000 USD) hardware. 145 146Most bottlenecks appear to be in foreign source data access (the 147source just cannot extract revisions fast enough) or disk IO (fast-import 148writes as fast as the disk will take the data). Imports will run 149faster if the source data is stored on a different drive than the 150destination Git repository (due to less IO contention). 151 152 153Development Cost 154---------------- 155A typical frontend for fast-import tends to weigh in at approximately 200 156lines of Perl/Python/Ruby code. Most developers have been able to 157create working importers in just a couple of hours, even though it 158is their first exposure to fast-import, and sometimes even to Git. This is 159an ideal situation, given that most conversion tools are throw-away 160(use once, and never look back). 161 162 163Parallel Operation 164------------------ 165Like 'git push' or 'git fetch', imports handled by fast-import are safe to 166run alongside parallel `git repack -a -d` or `git gc` invocations, 167or any other Git operation (including 'git prune', as loose objects 168are never used by fast-import). 169 170fast-import does not lock the branch or tag refs it is actively importing. 171After the import, during its ref update phase, fast-import tests each 172existing branch ref to verify the update will be a fast-forward 173update (the commit stored in the ref is contained in the new 174history of the commit to be written). If the update is not a 175fast-forward update, fast-import will skip updating that ref and instead 176prints a warning message. fast-import will always attempt to update all 177branch refs, and does not stop on the first failure. 178 179Branch updates can be forced with \--force, but it's recommended that 180this only be used on an otherwise quiet repository. Using \--force 181is not necessary for an initial import into an empty repository. 182 183 184Technical Discussion 185-------------------- 186fast-import tracks a set of branches in memory. Any branch can be created 187or modified at any point during the import process by sending a 188`commit` command on the input stream. This design allows a frontend 189program to process an unlimited number of branches simultaneously, 190generating commits in the order they are available from the source 191data. It also simplifies the frontend programs considerably. 192 193fast-import does not use or alter the current working directory, or any 194file within it. (It does however update the current Git repository, 195as referenced by `GIT_DIR`.) Therefore an import frontend may use 196the working directory for its own purposes, such as extracting file 197revisions from the foreign source. This ignorance of the working 198directory also allows fast-import to run very quickly, as it does not 199need to perform any costly file update operations when switching 200between branches. 201 202Input Format 203------------ 204With the exception of raw file data (which Git does not interpret) 205the fast-import input format is text (ASCII) based. This text based 206format simplifies development and debugging of frontend programs, 207especially when a higher level language such as Perl, Python or 208Ruby is being used. 209 210fast-import is very strict about its input. Where we say SP below we mean 211*exactly* one space. Likewise LF means one (and only one) linefeed 212and HT one (and only one) horizontal tab. 213Supplying additional whitespace characters will cause unexpected 214results, such as branch names or file names with leading or trailing 215spaces in their name, or early termination of fast-import when it encounters 216unexpected input. 217 218Stream Comments 219~~~~~~~~~~~~~~~ 220To aid in debugging frontends fast-import ignores any line that 221begins with `#` (ASCII pound/hash) up to and including the line 222ending `LF`. A comment line may contain any sequence of bytes 223that does not contain an LF and therefore may be used to include 224any detailed debugging information that might be specific to the 225frontend and useful when inspecting a fast-import data stream. 226 227Date Formats 228~~~~~~~~~~~~ 229The following date formats are supported. A frontend should select 230the format it will use for this import by passing the format name 231in the \--date-format=<fmt> command line option. 232 233`raw`:: 234 This is the Git native format and is `<time> SP <offutc>`. 235 It is also fast-import's default format, if \--date-format was 236 not specified. 237+ 238The time of the event is specified by `<time>` as the number of 239seconds since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is 240written as an ASCII decimal integer. 241+ 242The local offset is specified by `<offutc>` as a positive or negative 243offset from UTC. For example EST (which is 5 hours behind UTC) 244would be expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. 245The local offset does not affect `<time>`; it is used only as an 246advisement to help formatting routines display the timestamp. 247+ 248If the local offset is not available in the source material, use 249``+0000'', or the most common local offset. For example many 250organizations have a CVS repository which has only ever been accessed 251by users who are located in the same location and timezone. In this 252case a reasonable offset from UTC could be assumed. 253+ 254Unlike the `rfc2822` format, this format is very strict. Any 255variation in formatting will cause fast-import to reject the value. 256 257`rfc2822`:: 258 This is the standard email format as described by RFC 2822. 259+ 260An example value is ``Tue Feb 6 11:22:18 2007 -0500''. The Git 261parser is accurate, but a little on the lenient side. It is the 262same parser used by 'git am' when applying patches 263received from email. 264+ 265Some malformed strings may be accepted as valid dates. In some of 266these cases Git will still be able to obtain the correct date from 267the malformed string. There are also some types of malformed 268strings which Git will parse wrong, and yet consider valid. 269Seriously malformed strings will be rejected. 270+ 271Unlike the `raw` format above, the timezone/UTC offset information 272contained in an RFC 2822 date string is used to adjust the date 273value to UTC prior to storage. Therefore it is important that 274this information be as accurate as possible. 275+ 276If the source material uses RFC 2822 style dates, 277the frontend should let fast-import handle the parsing and conversion 278(rather than attempting to do it itself) as the Git parser has 279been well tested in the wild. 280+ 281Frontends should prefer the `raw` format if the source material 282already uses UNIX-epoch format, can be coaxed to give dates in that 283format, or its format is easily convertible to it, as there is no 284ambiguity in parsing. 285 286`now`:: 287 Always use the current time and timezone. The literal 288 `now` must always be supplied for `<when>`. 289+ 290This is a toy format. The current time and timezone of this system 291is always copied into the identity string at the time it is being 292created by fast-import. There is no way to specify a different time or 293timezone. 294+ 295This particular format is supplied as it's short to implement and 296may be useful to a process that wants to create a new commit 297right now, without needing to use a working directory or 298'git update-index'. 299+ 300If separate `author` and `committer` commands are used in a `commit` 301the timestamps may not match, as the system clock will be polled 302twice (once for each command). The only way to ensure that both 303author and committer identity information has the same timestamp 304is to omit `author` (thus copying from `committer`) or to use a 305date format other than `now`. 306 307Commands 308~~~~~~~~ 309fast-import accepts several commands to update the current repository 310and control the current import process. More detailed discussion 311(with examples) of each command follows later. 312 313`commit`:: 314 Creates a new branch or updates an existing branch by 315 creating a new commit and updating the branch to point at 316 the newly created commit. 317 318`tag`:: 319 Creates an annotated tag object from an existing commit or 320 branch. Lightweight tags are not supported by this command, 321 as they are not recommended for recording meaningful points 322 in time. 323 324`reset`:: 325 Reset an existing branch (or a new branch) to a specific 326 revision. This command must be used to change a branch to 327 a specific revision without making a commit on it. 328 329`blob`:: 330 Convert raw file data into a blob, for future use in a 331 `commit` command. This command is optional and is not 332 needed to perform an import. 333 334`checkpoint`:: 335 Forces fast-import to close the current packfile, generate its 336 unique SHA-1 checksum and index, and start a new packfile. 337 This command is optional and is not needed to perform 338 an import. 339 340`progress`:: 341 Causes fast-import to echo the entire line to its own 342 standard output. This command is optional and is not needed 343 to perform an import. 344 345`done`:: 346 Marks the end of the stream. This command is optional 347 unless the `done` feature was requested using the 348 `--done` command line option or `feature done` command. 349 350`cat-blob`:: 351 Causes fast-import to print a blob in 'cat-file --batch' 352 format to the file descriptor set with `--cat-blob-fd` or 353 `stdout` if unspecified. 354 355`ls`:: 356 Causes fast-import to print a line describing a directory 357 entry in 'ls-tree' format to the file descriptor set with 358 `--cat-blob-fd` or `stdout` if unspecified. 359 360`feature`:: 361 Require that fast-import supports the specified feature, or 362 abort if it does not. 363 364`option`:: 365 Specify any of the options listed under OPTIONS that do not 366 change stream semantic to suit the frontend's needs. This 367 command is optional and is not needed to perform an import. 368 369`commit` 370~~~~~~~~ 371Create or update a branch with a new commit, recording one logical 372change to the project. 373 374.... 375 'commit' SP <ref> LF 376 mark? 377 ('author' (SP <name>)? SP LT <email> GT SP <when> LF)? 378 'committer' (SP <name>)? SP LT <email> GT SP <when> LF 379 data 380 ('from' SP <committish> LF)? 381 ('merge' SP <committish> LF)? 382 (filemodify | filedelete | filecopy | filerename | filedeleteall | notemodify)* 383 LF? 384.... 385 386where `<ref>` is the name of the branch to make the commit on. 387Typically branch names are prefixed with `refs/heads/` in 388Git, so importing the CVS branch symbol `RELENG-1_0` would use 389`refs/heads/RELENG-1_0` for the value of `<ref>`. The value of 390`<ref>` must be a valid refname in Git. As `LF` is not valid in 391a Git refname, no quoting or escaping syntax is supported here. 392 393A `mark` command may optionally appear, requesting fast-import to save a 394reference to the newly created commit for future use by the frontend 395(see below for format). It is very common for frontends to mark 396every commit they create, thereby allowing future branch creation 397from any imported commit. 398 399The `data` command following `committer` must supply the commit 400message (see below for `data` command syntax). To import an empty 401commit message use a 0 length data. Commit messages are free-form 402and are not interpreted by Git. Currently they must be encoded in 403UTF-8, as fast-import does not permit other encodings to be specified. 404 405Zero or more `filemodify`, `filedelete`, `filecopy`, `filerename`, 406`filedeleteall` and `notemodify` commands 407may be included to update the contents of the branch prior to 408creating the commit. These commands may be supplied in any order. 409However it is recommended that a `filedeleteall` command precede 410all `filemodify`, `filecopy`, `filerename` and `notemodify` commands in 411the same commit, as `filedeleteall` wipes the branch clean (see below). 412 413The `LF` after the command is optional (it used to be required). 414 415`author` 416^^^^^^^^ 417An `author` command may optionally appear, if the author information 418might differ from the committer information. If `author` is omitted 419then fast-import will automatically use the committer's information for 420the author portion of the commit. See below for a description of 421the fields in `author`, as they are identical to `committer`. 422 423`committer` 424^^^^^^^^^^^ 425The `committer` command indicates who made this commit, and when 426they made it. 427 428Here `<name>` is the person's display name (for example 429``Com M Itter'') and `<email>` is the person's email address 430(``cm@example.com''). `LT` and `GT` are the literal less-than (\x3c) 431and greater-than (\x3e) symbols. These are required to delimit 432the email address from the other fields in the line. Note that 433`<name>` and `<email>` are free-form and may contain any sequence 434of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 encoded. 435 436The time of the change is specified by `<when>` using the date format 437that was selected by the \--date-format=<fmt> command line option. 438See ``Date Formats'' above for the set of supported formats, and 439their syntax. 440 441`from` 442^^^^^^ 443The `from` command is used to specify the commit to initialize 444this branch from. This revision will be the first ancestor of the 445new commit. The state of the tree built at this commit will begin 446with the state at the `from` commit, and be altered by the content 447modifications in this commit. 448 449Omitting the `from` command in the first commit of a new branch 450will cause fast-import to create that commit with no ancestor. This 451tends to be desired only for the initial commit of a project. 452If the frontend creates all files from scratch when making a new 453branch, a `merge` command may be used instead of `from` to start 454the commit with an empty tree. 455Omitting the `from` command on existing branches is usually desired, 456as the current commit on that branch is automatically assumed to 457be the first ancestor of the new commit. 458 459As `LF` is not valid in a Git refname or SHA-1 expression, no 460quoting or escaping syntax is supported within `<committish>`. 461 462Here `<committish>` is any of the following: 463 464* The name of an existing branch already in fast-import's internal branch 465 table. If fast-import doesn't know the name, it's treated as a SHA-1 466 expression. 467 468* A mark reference, `:<idnum>`, where `<idnum>` is the mark number. 469+ 470The reason fast-import uses `:` to denote a mark reference is this character 471is not legal in a Git branch name. The leading `:` makes it easy 472to distinguish between the mark 42 (`:42`) and the branch 42 (`42` 473or `refs/heads/42`), or an abbreviated SHA-1 which happened to 474consist only of base-10 digits. 475+ 476Marks must be declared (via `mark`) before they can be used. 477 478* A complete 40 byte or abbreviated commit SHA-1 in hex. 479 480* Any valid Git SHA-1 expression that resolves to a commit. See 481 ``SPECIFYING REVISIONS'' in linkgit:gitrevisions[7] for details. 482 483The special case of restarting an incremental import from the 484current branch value should be written as: 485---- 486 from refs/heads/branch^0 487---- 488The `^0` suffix is necessary as fast-import does not permit a branch to 489start from itself, and the branch is created in memory before the 490`from` command is even read from the input. Adding `^0` will force 491fast-import to resolve the commit through Git's revision parsing library, 492rather than its internal branch table, thereby loading in the 493existing value of the branch. 494 495`merge` 496^^^^^^^ 497Includes one additional ancestor commit. The additional ancestry 498link does not change the way the tree state is built at this commit. 499If the `from` command is 500omitted when creating a new branch, the first `merge` commit will be 501the first ancestor of the current commit, and the branch will start 502out with no files. An unlimited number of `merge` commands per 503commit are permitted by fast-import, thereby establishing an n-way merge. 504However Git's other tools never create commits with more than 15 505additional ancestors (forming a 16-way merge). For this reason 506it is suggested that frontends do not use more than 15 `merge` 507commands per commit; 16, if starting a new, empty branch. 508 509Here `<committish>` is any of the commit specification expressions 510also accepted by `from` (see above). 511 512`filemodify` 513^^^^^^^^^^^^ 514Included in a `commit` command to add a new file or change the 515content of an existing file. This command has two different means 516of specifying the content of the file. 517 518External data format:: 519 The data content for the file was already supplied by a prior 520 `blob` command. The frontend just needs to connect it. 521+ 522.... 523 'M' SP <mode> SP <dataref> SP <path> LF 524.... 525+ 526Here usually `<dataref>` must be either a mark reference (`:<idnum>`) 527set by a prior `blob` command, or a full 40-byte SHA-1 of an 528existing Git blob object. If `<mode>` is `040000`` then 529`<dataref>` must be the full 40-byte SHA-1 of an existing 530Git tree object or a mark reference set with `--import-marks`. 531 532Inline data format:: 533 The data content for the file has not been supplied yet. 534 The frontend wants to supply it as part of this modify 535 command. 536+ 537.... 538 'M' SP <mode> SP 'inline' SP <path> LF 539 data 540.... 541+ 542See below for a detailed description of the `data` command. 543 544In both formats `<mode>` is the type of file entry, specified 545in octal. Git only supports the following modes: 546 547* `100644` or `644`: A normal (not-executable) file. The majority 548 of files in most projects use this mode. If in doubt, this is 549 what you want. 550* `100755` or `755`: A normal, but executable, file. 551* `120000`: A symlink, the content of the file will be the link target. 552* `160000`: A gitlink, SHA-1 of the object refers to a commit in 553 another repository. Git links can only be specified by SHA or through 554 a commit mark. They are used to implement submodules. 555* `040000`: A subdirectory. Subdirectories can only be specified by 556 SHA or through a tree mark set with `--import-marks`. 557 558In both formats `<path>` is the complete path of the file to be added 559(if not already existing) or modified (if already existing). 560 561A `<path>` string must use UNIX-style directory separators (forward 562slash `/`), may contain any byte other than `LF`, and must not 563start with double quote (`"`). 564 565If an `LF` or double quote must be encoded into `<path>` shell-style 566quoting should be used, e.g. `"path/with\n and \" in it"`. 567 568The value of `<path>` must be in canonical form. That is it must not: 569 570* contain an empty directory component (e.g. `foo//bar` is invalid), 571* end with a directory separator (e.g. `foo/` is invalid), 572* start with a directory separator (e.g. `/foo` is invalid), 573* contain the special component `.` or `..` (e.g. `foo/./bar` and 574 `foo/../bar` are invalid). 575 576The root of the tree can be represented by an empty string as `<path>`. 577 578It is recommended that `<path>` always be encoded using UTF-8. 579 580`filedelete` 581^^^^^^^^^^^^ 582Included in a `commit` command to remove a file or recursively 583delete an entire directory from the branch. If the file or directory 584removal makes its parent directory empty, the parent directory will 585be automatically removed too. This cascades up the tree until the 586first non-empty directory or the root is reached. 587 588.... 589 'D' SP <path> LF 590.... 591 592here `<path>` is the complete path of the file or subdirectory to 593be removed from the branch. 594See `filemodify` above for a detailed description of `<path>`. 595 596`filecopy` 597^^^^^^^^^^^^ 598Recursively copies an existing file or subdirectory to a different 599location within the branch. The existing file or directory must 600exist. If the destination exists it will be completely replaced 601by the content copied from the source. 602 603.... 604 'C' SP <path> SP <path> LF 605.... 606 607here the first `<path>` is the source location and the second 608`<path>` is the destination. See `filemodify` above for a detailed 609description of what `<path>` may look like. To use a source path 610that contains SP the path must be quoted. 611 612A `filecopy` command takes effect immediately. Once the source 613location has been copied to the destination any future commands 614applied to the source location will not impact the destination of 615the copy. 616 617`filerename` 618^^^^^^^^^^^^ 619Renames an existing file or subdirectory to a different location 620within the branch. The existing file or directory must exist. If 621the destination exists it will be replaced by the source directory. 622 623.... 624 'R' SP <path> SP <path> LF 625.... 626 627here the first `<path>` is the source location and the second 628`<path>` is the destination. See `filemodify` above for a detailed 629description of what `<path>` may look like. To use a source path 630that contains SP the path must be quoted. 631 632A `filerename` command takes effect immediately. Once the source 633location has been renamed to the destination any future commands 634applied to the source location will create new files there and not 635impact the destination of the rename. 636 637Note that a `filerename` is the same as a `filecopy` followed by a 638`filedelete` of the source location. There is a slight performance 639advantage to using `filerename`, but the advantage is so small 640that it is never worth trying to convert a delete/add pair in 641source material into a rename for fast-import. This `filerename` 642command is provided just to simplify frontends that already have 643rename information and don't want bother with decomposing it into a 644`filecopy` followed by a `filedelete`. 645 646`filedeleteall` 647^^^^^^^^^^^^^^^ 648Included in a `commit` command to remove all files (and also all 649directories) from the branch. This command resets the internal 650branch structure to have no files in it, allowing the frontend 651to subsequently add all interesting files from scratch. 652 653.... 654 'deleteall' LF 655.... 656 657This command is extremely useful if the frontend does not know 658(or does not care to know) what files are currently on the branch, 659and therefore cannot generate the proper `filedelete` commands to 660update the content. 661 662Issuing a `filedeleteall` followed by the needed `filemodify` 663commands to set the correct content will produce the same results 664as sending only the needed `filemodify` and `filedelete` commands. 665The `filedeleteall` approach may however require fast-import to use slightly 666more memory per active branch (less than 1 MiB for even most large 667projects); so frontends that can easily obtain only the affected 668paths for a commit are encouraged to do so. 669 670`notemodify` 671^^^^^^^^^^^^ 672Included in a `commit` `<notes_ref>` command to add a new note 673annotating a `<committish>` or change this annotation contents. 674Internally it is similar to filemodify 100644 on `<committish>` 675path (maybe split into subdirectories). It's not advised to 676use any other commands to write to the `<notes_ref>` tree except 677`filedeleteall` to delete all existing notes in this tree. 678This command has two different means of specifying the content 679of the note. 680 681External data format:: 682 The data content for the note was already supplied by a prior 683 `blob` command. The frontend just needs to connect it to the 684 commit that is to be annotated. 685+ 686.... 687 'N' SP <dataref> SP <committish> LF 688.... 689+ 690Here `<dataref>` can be either a mark reference (`:<idnum>`) 691set by a prior `blob` command, or a full 40-byte SHA-1 of an 692existing Git blob object. 693 694Inline data format:: 695 The data content for the note has not been supplied yet. 696 The frontend wants to supply it as part of this modify 697 command. 698+ 699.... 700 'N' SP 'inline' SP <committish> LF 701 data 702.... 703+ 704See below for a detailed description of the `data` command. 705 706In both formats `<committish>` is any of the commit specification 707expressions also accepted by `from` (see above). 708 709`mark` 710~~~~~~ 711Arranges for fast-import to save a reference to the current object, allowing 712the frontend to recall this object at a future point in time, without 713knowing its SHA-1. Here the current object is the object creation 714command the `mark` command appears within. This can be `commit`, 715`tag`, and `blob`, but `commit` is the most common usage. 716 717.... 718 'mark' SP ':' <idnum> LF 719.... 720 721where `<idnum>` is the number assigned by the frontend to this mark. 722The value of `<idnum>` is expressed as an ASCII decimal integer. 723The value 0 is reserved and cannot be used as 724a mark. Only values greater than or equal to 1 may be used as marks. 725 726New marks are created automatically. Existing marks can be moved 727to another object simply by reusing the same `<idnum>` in another 728`mark` command. 729 730`tag` 731~~~~~ 732Creates an annotated tag referring to a specific commit. To create 733lightweight (non-annotated) tags see the `reset` command below. 734 735.... 736 'tag' SP <name> LF 737 'from' SP <committish> LF 738 'tagger' (SP <name>)? SP LT <email> GT SP <when> LF 739 data 740.... 741 742where `<name>` is the name of the tag to create. 743 744Tag names are automatically prefixed with `refs/tags/` when stored 745in Git, so importing the CVS branch symbol `RELENG-1_0-FINAL` would 746use just `RELENG-1_0-FINAL` for `<name>`, and fast-import will write the 747corresponding ref as `refs/tags/RELENG-1_0-FINAL`. 748 749The value of `<name>` must be a valid refname in Git and therefore 750may contain forward slashes. As `LF` is not valid in a Git refname, 751no quoting or escaping syntax is supported here. 752 753The `from` command is the same as in the `commit` command; see 754above for details. 755 756The `tagger` command uses the same format as `committer` within 757`commit`; again see above for details. 758 759The `data` command following `tagger` must supply the annotated tag 760message (see below for `data` command syntax). To import an empty 761tag message use a 0 length data. Tag messages are free-form and are 762not interpreted by Git. Currently they must be encoded in UTF-8, 763as fast-import does not permit other encodings to be specified. 764 765Signing annotated tags during import from within fast-import is not 766supported. Trying to include your own PGP/GPG signature is not 767recommended, as the frontend does not (easily) have access to the 768complete set of bytes which normally goes into such a signature. 769If signing is required, create lightweight tags from within fast-import with 770`reset`, then create the annotated versions of those tags offline 771with the standard 'git tag' process. 772 773`reset` 774~~~~~~~ 775Creates (or recreates) the named branch, optionally starting from 776a specific revision. The reset command allows a frontend to issue 777a new `from` command for an existing branch, or to create a new 778branch from an existing commit without creating a new commit. 779 780.... 781 'reset' SP <ref> LF 782 ('from' SP <committish> LF)? 783 LF? 784.... 785 786For a detailed description of `<ref>` and `<committish>` see above 787under `commit` and `from`. 788 789The `LF` after the command is optional (it used to be required). 790 791The `reset` command can also be used to create lightweight 792(non-annotated) tags. For example: 793 794==== 795 reset refs/tags/938 796 from :938 797==== 798 799would create the lightweight tag `refs/tags/938` referring to 800whatever commit mark `:938` references. 801 802`blob` 803~~~~~~ 804Requests writing one file revision to the packfile. The revision 805is not connected to any commit; this connection must be formed in 806a subsequent `commit` command by referencing the blob through an 807assigned mark. 808 809.... 810 'blob' LF 811 mark? 812 data 813.... 814 815The mark command is optional here as some frontends have chosen 816to generate the Git SHA-1 for the blob on their own, and feed that 817directly to `commit`. This is typically more work than it's worth 818however, as marks are inexpensive to store and easy to use. 819 820`data` 821~~~~~~ 822Supplies raw data (for use as blob/file content, commit messages, or 823annotated tag messages) to fast-import. Data can be supplied using an exact 824byte count or delimited with a terminating line. Real frontends 825intended for production-quality conversions should always use the 826exact byte count format, as it is more robust and performs better. 827The delimited format is intended primarily for testing fast-import. 828 829Comment lines appearing within the `<raw>` part of `data` commands 830are always taken to be part of the body of the data and are therefore 831never ignored by fast-import. This makes it safe to import any 832file/message content whose lines might start with `#`. 833 834Exact byte count format:: 835 The frontend must specify the number of bytes of data. 836+ 837.... 838 'data' SP <count> LF 839 <raw> LF? 840.... 841+ 842where `<count>` is the exact number of bytes appearing within 843`<raw>`. The value of `<count>` is expressed as an ASCII decimal 844integer. The `LF` on either side of `<raw>` is not 845included in `<count>` and will not be included in the imported data. 846+ 847The `LF` after `<raw>` is optional (it used to be required) but 848recommended. Always including it makes debugging a fast-import 849stream easier as the next command always starts in column 0 850of the next line, even if `<raw>` did not end with an `LF`. 851 852Delimited format:: 853 A delimiter string is used to mark the end of the data. 854 fast-import will compute the length by searching for the delimiter. 855 This format is primarily useful for testing and is not 856 recommended for real data. 857+ 858.... 859 'data' SP '<<' <delim> LF 860 <raw> LF 861 <delim> LF 862 LF? 863.... 864+ 865where `<delim>` is the chosen delimiter string. The string `<delim>` 866must not appear on a line by itself within `<raw>`, as otherwise 867fast-import will think the data ends earlier than it really does. The `LF` 868immediately trailing `<raw>` is part of `<raw>`. This is one of 869the limitations of the delimited format, it is impossible to supply 870a data chunk which does not have an LF as its last byte. 871+ 872The `LF` after `<delim> LF` is optional (it used to be required). 873 874`checkpoint` 875~~~~~~~~~~~~ 876Forces fast-import to close the current packfile, start a new one, and to 877save out all current branch refs, tags and marks. 878 879.... 880 'checkpoint' LF 881 LF? 882.... 883 884Note that fast-import automatically switches packfiles when the current 885packfile reaches \--max-pack-size, or 4 GiB, whichever limit is 886smaller. During an automatic packfile switch fast-import does not update 887the branch refs, tags or marks. 888 889As a `checkpoint` can require a significant amount of CPU time and 890disk IO (to compute the overall pack SHA-1 checksum, generate the 891corresponding index file, and update the refs) it can easily take 892several minutes for a single `checkpoint` command to complete. 893 894Frontends may choose to issue checkpoints during extremely large 895and long running imports, or when they need to allow another Git 896process access to a branch. However given that a 30 GiB Subversion 897repository can be loaded into Git through fast-import in about 3 hours, 898explicit checkpointing may not be necessary. 899 900The `LF` after the command is optional (it used to be required). 901 902`progress` 903~~~~~~~~~~ 904Causes fast-import to print the entire `progress` line unmodified to 905its standard output channel (file descriptor 1) when the command is 906processed from the input stream. The command otherwise has no impact 907on the current import, or on any of fast-import's internal state. 908 909.... 910 'progress' SP <any> LF 911 LF? 912.... 913 914The `<any>` part of the command may contain any sequence of bytes 915that does not contain `LF`. The `LF` after the command is optional. 916Callers may wish to process the output through a tool such as sed to 917remove the leading part of the line, for example: 918 919==== 920 frontend | git fast-import | sed 's/^progress //' 921==== 922 923Placing a `progress` command immediately after a `checkpoint` will 924inform the reader when the `checkpoint` has been completed and it 925can safely access the refs that fast-import updated. 926 927`cat-blob` 928~~~~~~~~~~ 929Causes fast-import to print a blob to a file descriptor previously 930arranged with the `--cat-blob-fd` argument. The command otherwise 931has no impact on the current import; its main purpose is to 932retrieve blobs that may be in fast-import's memory but not 933accessible from the target repository. 934 935.... 936 'cat-blob' SP <dataref> LF 937.... 938 939The `<dataref>` can be either a mark reference (`:<idnum>`) 940set previously or a full 40-byte SHA-1 of a Git blob, preexisting or 941ready to be written. 942 943Output uses the same format as `git cat-file --batch`: 944 945==== 946 <sha1> SP 'blob' SP <size> LF 947 <contents> LF 948==== 949 950This command can be used anywhere in the stream that comments are 951accepted. In particular, the `cat-blob` command can be used in the 952middle of a commit but not in the middle of a `data` command. 953 954See ``Responses To Commands'' below for details about how to read 955this output safely. 956 957`ls` 958~~~~ 959Prints information about the object at a path to a file descriptor 960previously arranged with the `--cat-blob-fd` argument. This allows 961printing a blob from the active commit (with `cat-blob`) or copying a 962blob or tree from a previous commit for use in the current one (with 963`filemodify`). 964 965The `ls` command can be used anywhere in the stream that comments are 966accepted, including the middle of a commit. 967 968Reading from the active commit:: 969 This form can only be used in the middle of a `commit`. 970 The path names a directory entry within fast-import's 971 active commit. The path must be quoted in this case. 972+ 973.... 974 'ls' SP <path> LF 975.... 976 977Reading from a named tree:: 978 The `<dataref>` can be a mark reference (`:<idnum>`) or the 979 full 40-byte SHA-1 of a Git tag, commit, or tree object, 980 preexisting or waiting to be written. 981 The path is relative to the top level of the tree 982 named by `<dataref>`. 983+ 984.... 985 'ls' SP <dataref> SP <path> LF 986.... 987 988See `filemodify` above for a detailed description of `<path>`. 989 990Output uses the same format as `git ls-tree <tree> -- <path>`: 991 992==== 993 <mode> SP ('blob' | 'tree' | 'commit') SP <dataref> HT <path> LF 994==== 995 996The <dataref> represents the blob, tree, or commit object at <path> 997and can be used in later 'cat-blob', 'filemodify', or 'ls' commands. 998 999If there is no file or subtree at that path, 'git fast-import' will1000instead report10011002====1003 missing SP <path> LF1004====10051006See ``Responses To Commands'' below for details about how to read1007this output safely.10081009`feature`1010~~~~~~~~~1011Require that fast-import supports the specified feature, or abort if1012it does not.10131014....1015 'feature' SP <feature> ('=' <argument>)? LF1016....10171018The <feature> part of the command may be any one of the following:10191020date-format::1021export-marks::1022relative-marks::1023no-relative-marks::1024force::1025 Act as though the corresponding command-line option with1026 a leading '--' was passed on the command line1027 (see OPTIONS, above).10281029import-marks::1030import-marks-if-exists::1031 Like --import-marks except in two respects: first, only one1032 "feature import-marks" or "feature import-marks-if-exists"1033 command is allowed per stream; second, an --import-marks=1034 or --import-marks-if-exists command-line option overrides1035 any of these "feature" commands in the stream; third,1036 "feature import-marks-if-exists" like a corresponding1037 command-line option silently skips a nonexistent file.10381039cat-blob::1040ls::1041 Require that the backend support the 'cat-blob' or 'ls' command.1042 Versions of fast-import not supporting the specified command1043 will exit with a message indicating so.1044 This lets the import error out early with a clear message,1045 rather than wasting time on the early part of an import1046 before the unsupported command is detected.10471048notes::1049 Require that the backend support the 'notemodify' (N)1050 subcommand to the 'commit' command.1051 Versions of fast-import not supporting notes will exit1052 with a message indicating so.10531054done::1055 Error out if the stream ends without a 'done' command.1056 Without this feature, errors causing the frontend to end1057 abruptly at a convenient point in the stream can go1058 undetected. This may occur, for example, if an import1059 front end dies in mid-operation without emitting SIGTERM1060 or SIGKILL at its subordinate git fast-import instance.10611062`option`1063~~~~~~~~1064Processes the specified option so that git fast-import behaves in a1065way that suits the frontend's needs.1066Note that options specified by the frontend are overridden by any1067options the user may specify to git fast-import itself.10681069....1070 'option' SP <option> LF1071....10721073The `<option>` part of the command may contain any of the options1074listed in the OPTIONS section that do not change import semantics,1075without the leading '--' and is treated in the same way.10761077Option commands must be the first commands on the input (not counting1078feature commands), to give an option command after any non-option1079command is an error.10801081The following commandline options change import semantics and may therefore1082not be passed as option:10831084* date-format1085* import-marks1086* export-marks1087* cat-blob-fd1088* force10891090`done`1091~~~~~~1092If the `done` feature is not in use, treated as if EOF was read.1093This can be used to tell fast-import to finish early.10941095If the `--done` command line option or `feature done` command is1096in use, the `done` command is mandatory and marks the end of the1097stream.10981099Responses To Commands1100---------------------1101New objects written by fast-import are not available immediately.1102Most fast-import commands have no visible effect until the next1103checkpoint (or completion). The frontend can send commands to1104fill fast-import's input pipe without worrying about how quickly1105they will take effect, which improves performance by simplifying1106scheduling.11071108For some frontends, though, it is useful to be able to read back1109data from the current repository as it is being updated (for1110example when the source material describes objects in terms of1111patches to be applied to previously imported objects). This can1112be accomplished by connecting the frontend and fast-import via1113bidirectional pipes:11141115====1116 mkfifo fast-import-output1117 frontend <fast-import-output |1118 git fast-import >fast-import-output1119====11201121A frontend set up this way can use `progress`, `ls`, and `cat-blob`1122commands to read information from the import in progress.11231124To avoid deadlock, such frontends must completely consume any1125pending output from `progress`, `ls`, and `cat-blob` before1126performing writes to fast-import that might block.11271128Crash Reports1129-------------1130If fast-import is supplied invalid input it will terminate with a1131non-zero exit status and create a crash report in the top level of1132the Git repository it was importing into. Crash reports contain1133a snapshot of the internal fast-import state as well as the most1134recent commands that lead up to the crash.11351136All recent commands (including stream comments, file changes and1137progress commands) are shown in the command history within the crash1138report, but raw file data and commit messages are excluded from the1139crash report. This exclusion saves space within the report file1140and reduces the amount of buffering that fast-import must perform1141during execution.11421143After writing a crash report fast-import will close the current1144packfile and export the marks table. This allows the frontend1145developer to inspect the repository state and resume the import from1146the point where it crashed. The modified branches and tags are not1147updated during a crash, as the import did not complete successfully.1148Branch and tag information can be found in the crash report and1149must be applied manually if the update is needed.11501151An example crash:11521153====1154 $ cat >in <<END_OF_INPUT1155 # my very first test commit1156 commit refs/heads/master1157 committer Shawn O. Pearce <spearce> 19283 -04001158 # who is that guy anyway?1159 data <<EOF1160 this is my commit1161 EOF1162 M 644 inline .gitignore1163 data <<EOF1164 .gitignore1165 EOF1166 M 777 inline bob1167 END_OF_INPUT11681169 $ git fast-import <in1170 fatal: Corrupt mode: M 777 inline bob1171 fast-import: dumping crash report to .git/fast_import_crash_843411721173 $ cat .git/fast_import_crash_84341174 fast-import crash report:1175 fast-import process: 84341176 parent process : 13911177 at Sat Sep 1 00:58:12 200711781179 fatal: Corrupt mode: M 777 inline bob11801181 Most Recent Commands Before Crash1182 ---------------------------------1183 # my very first test commit1184 commit refs/heads/master1185 committer Shawn O. Pearce <spearce> 19283 -04001186 # who is that guy anyway?1187 data <<EOF1188 M 644 inline .gitignore1189 data <<EOF1190 * M 777 inline bob11911192 Active Branch LRU1193 -----------------1194 active_branches = 1 cur, 5 max11951196 pos clock name1197 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1198 1) 0 refs/heads/master11991200 Inactive Branches1201 -----------------1202 refs/heads/master:1203 status : active loaded dirty1204 tip commit : 00000000000000000000000000000000000000001205 old tree : 00000000000000000000000000000000000000001206 cur tree : 00000000000000000000000000000000000000001207 commit clock: 01208 last pack :120912101211 -------------------1212 END OF CRASH REPORT1213====12141215Tips and Tricks1216---------------1217The following tips and tricks have been collected from various1218users of fast-import, and are offered here as suggestions.12191220Use One Mark Per Commit1221~~~~~~~~~~~~~~~~~~~~~~~1222When doing a repository conversion, use a unique mark per commit1223(`mark :<n>`) and supply the \--export-marks option on the command1224line. fast-import will dump a file which lists every mark and the Git1225object SHA-1 that corresponds to it. If the frontend can tie1226the marks back to the source repository, it is easy to verify the1227accuracy and completeness of the import by comparing each Git1228commit to the corresponding source revision.12291230Coming from a system such as Perforce or Subversion this should be1231quite simple, as the fast-import mark can also be the Perforce changeset1232number or the Subversion revision number.12331234Freely Skip Around Branches1235~~~~~~~~~~~~~~~~~~~~~~~~~~~1236Don't bother trying to optimize the frontend to stick to one branch1237at a time during an import. Although doing so might be slightly1238faster for fast-import, it tends to increase the complexity of the frontend1239code considerably.12401241The branch LRU builtin to fast-import tends to behave very well, and the1242cost of activating an inactive branch is so low that bouncing around1243between branches has virtually no impact on import performance.12441245Handling Renames1246~~~~~~~~~~~~~~~~1247When importing a renamed file or directory, simply delete the old1248name(s) and modify the new name(s) during the corresponding commit.1249Git performs rename detection after-the-fact, rather than explicitly1250during a commit.12511252Use Tag Fixup Branches1253~~~~~~~~~~~~~~~~~~~~~~1254Some other SCM systems let the user create a tag from multiple1255files which are not from the same commit/changeset. Or to create1256tags which are a subset of the files available in the repository.12571258Importing these tags as-is in Git is impossible without making at1259least one commit which ``fixes up'' the files to match the content1260of the tag. Use fast-import's `reset` command to reset a dummy branch1261outside of your normal branch space to the base commit for the tag,1262then commit one or more file fixup commits, and finally tag the1263dummy branch.12641265For example since all normal branches are stored under `refs/heads/`1266name the tag fixup branch `TAG_FIXUP`. This way it is impossible for1267the fixup branch used by the importer to have namespace conflicts1268with real branches imported from the source (the name `TAG_FIXUP`1269is not `refs/heads/TAG_FIXUP`).12701271When committing fixups, consider using `merge` to connect the1272commit(s) which are supplying file revisions to the fixup branch.1273Doing so will allow tools such as 'git blame' to track1274through the real commit history and properly annotate the source1275files.12761277After fast-import terminates the frontend will need to do `rm .git/TAG_FIXUP`1278to remove the dummy branch.12791280Import Now, Repack Later1281~~~~~~~~~~~~~~~~~~~~~~~~1282As soon as fast-import completes the Git repository is completely valid1283and ready for use. Typically this takes only a very short time,1284even for considerably large projects (100,000+ commits).12851286However repacking the repository is necessary to improve data1287locality and access performance. It can also take hours on extremely1288large projects (especially if -f and a large \--window parameter is1289used). Since repacking is safe to run alongside readers and writers,1290run the repack in the background and let it finish when it finishes.1291There is no reason to wait to explore your new Git project!12921293If you choose to wait for the repack, don't try to run benchmarks1294or performance tests until repacking is completed. fast-import outputs1295suboptimal packfiles that are simply never seen in real use1296situations.12971298Repacking Historical Data1299~~~~~~~~~~~~~~~~~~~~~~~~~1300If you are repacking very old imported data (e.g. older than the1301last year), consider expending some extra CPU time and supplying1302\--window=50 (or higher) when you run 'git repack'.1303This will take longer, but will also produce a smaller packfile.1304You only need to expend the effort once, and everyone using your1305project will benefit from the smaller repository.13061307Include Some Progress Messages1308~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~1309Every once in a while have your frontend emit a `progress` message1310to fast-import. The contents of the messages are entirely free-form,1311so one suggestion would be to output the current month and year1312each time the current commit date moves into the next month.1313Your users will feel better knowing how much of the data stream1314has been processed.131513161317Packfile Optimization1318---------------------1319When packing a blob fast-import always attempts to deltify against the last1320blob written. Unless specifically arranged for by the frontend,1321this will probably not be a prior version of the same file, so the1322generated delta will not be the smallest possible. The resulting1323packfile will be compressed, but will not be optimal.13241325Frontends which have efficient access to all revisions of a1326single file (for example reading an RCS/CVS ,v file) can choose1327to supply all revisions of that file as a sequence of consecutive1328`blob` commands. This allows fast-import to deltify the different file1329revisions against each other, saving space in the final packfile.1330Marks can be used to later identify individual file revisions during1331a sequence of `commit` commands.13321333The packfile(s) created by fast-import do not encourage good disk access1334patterns. This is caused by fast-import writing the data in the order1335it is received on standard input, while Git typically organizes1336data within packfiles to make the most recent (current tip) data1337appear before historical data. Git also clusters commits together,1338speeding up revision traversal through better cache locality.13391340For this reason it is strongly recommended that users repack the1341repository with `git repack -a -d` after fast-import completes, allowing1342Git to reorganize the packfiles for faster data access. If blob1343deltas are suboptimal (see above) then also adding the `-f` option1344to force recomputation of all deltas can significantly reduce the1345final packfile size (30-50% smaller can be quite typical).134613471348Memory Utilization1349------------------1350There are a number of factors which affect how much memory fast-import1351requires to perform an import. Like critical sections of core1352Git, fast-import uses its own memory allocators to amortize any overheads1353associated with malloc. In practice fast-import tends to amortize any1354malloc overheads to 0, due to its use of large block allocations.13551356per object1357~~~~~~~~~~1358fast-import maintains an in-memory structure for every object written in1359this execution. On a 32 bit system the structure is 32 bytes,1360on a 64 bit system the structure is 40 bytes (due to the larger1361pointer sizes). Objects in the table are not deallocated until1362fast-import terminates. Importing 2 million objects on a 32 bit system1363will require approximately 64 MiB of memory.13641365The object table is actually a hashtable keyed on the object name1366(the unique SHA-1). This storage configuration allows fast-import to reuse1367an existing or already written object and avoid writing duplicates1368to the output packfile. Duplicate blobs are surprisingly common1369in an import, typically due to branch merges in the source.13701371per mark1372~~~~~~~~1373Marks are stored in a sparse array, using 1 pointer (4 bytes or 81374bytes, depending on pointer size) per mark. Although the array1375is sparse, frontends are still strongly encouraged to use marks1376between 1 and n, where n is the total number of marks required for1377this import.13781379per branch1380~~~~~~~~~~1381Branches are classified as active and inactive. The memory usage1382of the two classes is significantly different.13831384Inactive branches are stored in a structure which uses 96 or 1201385bytes (32 bit or 64 bit systems, respectively), plus the length of1386the branch name (typically under 200 bytes), per branch. fast-import will1387easily handle as many as 10,000 inactive branches in under 2 MiB1388of memory.13891390Active branches have the same overhead as inactive branches, but1391also contain copies of every tree that has been recently modified on1392that branch. If subtree `include` has not been modified since the1393branch became active, its contents will not be loaded into memory,1394but if subtree `src` has been modified by a commit since the branch1395became active, then its contents will be loaded in memory.13961397As active branches store metadata about the files contained on that1398branch, their in-memory storage size can grow to a considerable size1399(see below).14001401fast-import automatically moves active branches to inactive status based on1402a simple least-recently-used algorithm. The LRU chain is updated on1403each `commit` command. The maximum number of active branches can be1404increased or decreased on the command line with \--active-branches=.14051406per active tree1407~~~~~~~~~~~~~~~1408Trees (aka directories) use just 12 bytes of memory on top of the1409memory required for their entries (see ``per active file'' below).1410The cost of a tree is virtually 0, as its overhead amortizes out1411over the individual file entries.14121413per active file entry1414~~~~~~~~~~~~~~~~~~~~~1415Files (and pointers to subtrees) within active trees require 52 or 641416bytes (32/64 bit platforms) per entry. To conserve space, file and1417tree names are pooled in a common string table, allowing the filename1418``Makefile'' to use just 16 bytes (after including the string header1419overhead) no matter how many times it occurs within the project.14201421The active branch LRU, when coupled with the filename string pool1422and lazy loading of subtrees, allows fast-import to efficiently import1423projects with 2,000+ branches and 45,114+ files in a very limited1424memory footprint (less than 2.7 MiB per active branch).14251426Signals1427-------1428Sending *SIGUSR1* to the 'git fast-import' process ends the current1429packfile early, simulating a `checkpoint` command. The impatient1430operator can use this facility to peek at the objects and refs from an1431import in progress, at the cost of some added running time and worse1432compression.14331434GIT1435---1436Part of the linkgit:git[1] suite