diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-12 04:34:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-12 04:34:57 (GMT) |
| commit | b578e509d3d346513efda14606886a55174e5181 (patch) | |
| tree | 3019a31dcc68a665620ecdb6fc8544d294d2a87f /Documentation | |
| parent | d4144612958c255d273ad1bd1fe33f03c0f67ada (diff) | |
| parent | c6ec3b13b81d59272e41d5316689c65dd4cc2e63 (diff) | |
| download | git-b578e509d3d346513efda14606886a55174e5181.zip git-b578e509d3d346513efda14606886a55174e5181.tar.gz git-b578e509d3d346513efda14606886a55174e5181.tar.bz2 | |
Merge branch 'master' of git://repo.or.cz/git/fastimport
* 'master' of git://repo.or.cz/git/fastimport:
bash: Hide git-fast-import.
fast-import: Add tip about importing renames.
fast-import: Hide the pack boundary commits by default.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fast-import.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2a50520..939ec46 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -64,6 +64,15 @@ OPTIONS Frontends can use this file to validate imports after they have been completed. +--export-pack-edges=<file>:: + After creating a packfile, print a line of data to + <file> listing the filename of the packfile and the last + commit on each branch that was written to that packfile. + This information may be useful after importing projects + whose total object set exceeds the 4 GiB packfile limit, + as these commits can be used as edge points during calls + to gitlink:git-pack-objects[1]. + --quiet:: Disable all non-fatal output, making fast-import silent when it is successful. This option disables the output shown by @@ -706,6 +715,13 @@ The branch LRU builtin to fast-import tends to behave very well, and the cost of activating an inactive branch is so low that bouncing around between branches has virtually no impact on import performance. +Handling Renames +~~~~~~~~~~~~~~~~ +When importing a renamed file or directory, simply delete the old +name(s) and modify the new name(s) during the corresponding commit. +Git performs rename detection after-the-fact, rather than explicitly +during a commit. + Use Tag Fixup Branches ~~~~~~~~~~~~~~~~~~~~~~ Some other SCM systems let the user create a tag from multiple |