diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-07-06 05:33:16 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-06 05:33:16 +0400 |
| commit | 08b51f51e6a4cf2f5ad4b893707f1337a450e499 (patch) | |
| tree | 1ff3a0c83f79c221194ac91ee6c2018d477ec7af /Documentation/gitcvs-migration.txt | |
| parent | 1fc561d169ac08c411e34a4439894c5201b3d080 (diff) | |
| parent | 9b373229506c9f563b2e2f053c3f1d932789fbfd (diff) | |
Merge branch 'qq/maint'
* qq/maint:
clone -q: honor "quiet" option over native transports.
attribute documentation: keep EXAMPLE at end
builtin-commit.c: Use 'git_config_string' to get 'commit.template'
http.c: Use 'git_config_string' to clean up SSL config.
diff.c: Use 'git_config_string' to get 'diff.external'
convert.c: Use 'git_config_string' to get 'smudge' and 'clean'
builtin-log.c: Use 'git_config_string' to get 'format.subjectprefix' and 'format.suffix'
Documentation cvs: Clarify when a bare repository is needed
Documentation: be precise about which date --pretty uses
Conflicts:
Documentation/gitattributes.txt
Diffstat (limited to 'Documentation/gitcvs-migration.txt')
| -rw-r--r-- | Documentation/gitcvs-migration.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index 2eb6972a93..aaa7ef737a 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -143,6 +143,11 @@ work, you must not modify the imported branches; instead, create new branches for your own changes, and merge in the imported branches as necessary. +If you want a shared repository, you will need to make a bare clone +of the imported directory, as described above. Then treat the imported +directory as another development clone for purposes of merging +incremental imports. + Advanced Shared Repository Management ------------------------------------- |