From: Junio C Hamano Date: Wed, 7 Feb 2007 16:39:16 +0000 (-0800) Subject: Merge branch 'master' of git://repo.or.cz/git/fastimport X-Git-Tag: v1.5.0-rc4~8 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/302da67472e322109e6299d38dd1a2c30bde9f4c?hp=099c7837678361985ca9df1240cdaf6a42fc89f9 Merge branch 'master' of git://repo.or.cz/git/fastimport * 'master' of git://repo.or.cz/git/fastimport: Add a Tips and Tricks section to fast-import's manual. Don't crash fast-import if the marks cannot be exported. Dump all refs and marks during a checkpoint in fast-import. Teach fast-import how to sit quietly in the corner. Teach fast-import how to clear the internal branch content. Minor timestamp related documentation corrections for fast-import. --- diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 1fe2c1dcf2..0b64d3348b 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -64,6 +64,18 @@ OPTIONS Frontends can use this file to validate imports after they have been completed. +--quiet:: + Disable all non-fatal output, making gfi silent when it + is successful. This option disables the output shown by + \--stats. + +--stats:: + Display some basic statistics about the objects gfi has + created, the packfiles they were stored into, and the + memory used by gfi during this run. Showing this output + is currently the default, but can be disabled with \--quiet. + + Performance ----------- The design of gfi allows it to import large projects in a minimum @@ -106,8 +118,8 @@ fast-forward update, gfi will skip updating that ref and instead prints a warning message. gfi will always attempt to update all branch refs, and does not stop on the first failure. -Branch updates can be forced with `--force`, but its recommended that -this only be used on an otherwise quiet repository. Using `--force` +Branch updates can be forced with \--force, but its recommended that +this only be used on an otherwise quiet repository. Using \--force is not necessary for an initial import into an empty repository. @@ -148,26 +160,28 @@ Date Formats ~~~~~~~~~~~~ The following date formats are supported. A frontend should select the format it will use for this import by passing the format name -in the `--date-format=` command line option. +in the \--date-format= command line option. `raw`:: - This is the Git native format and is `