Fossil SCM
Mention the --force option in import's help.
Commit
08ed91a7b21e9b3c8f7c2afa8dbb245cfa3ab611
Parent
97d8a08ac953661…
1 file changed
+3
-1
+3
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -723,14 +723,16 @@ | ||
| 723 | 723 | ** The git-fast-export file format is currently the only VCS interchange |
| 724 | 724 | ** format that is understood, though other interchange formats may be added |
| 725 | 725 | ** in the future. |
| 726 | 726 | ** |
| 727 | 727 | ** The --incremental option allows an existing repository to be extended |
| 728 | -** with new content. | |
| 728 | +** with new content. Otherwise, if a file with the same name as NEW-REPOSITORY | |
| 729 | +** is found, the command fails unless the --force option is used. | |
| 729 | 730 | ** |
| 730 | 731 | ** Options: |
| 731 | 732 | ** --incremental allow importing into an existing repository |
| 733 | +** --force remove existing file | |
| 732 | 734 | ** |
| 733 | 735 | ** See also: export |
| 734 | 736 | */ |
| 735 | 737 | void git_import_cmd(void){ |
| 736 | 738 | char *zPassword; |
| 737 | 739 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -723,14 +723,16 @@ | |
| 723 | ** The git-fast-export file format is currently the only VCS interchange |
| 724 | ** format that is understood, though other interchange formats may be added |
| 725 | ** in the future. |
| 726 | ** |
| 727 | ** The --incremental option allows an existing repository to be extended |
| 728 | ** with new content. |
| 729 | ** |
| 730 | ** Options: |
| 731 | ** --incremental allow importing into an existing repository |
| 732 | ** |
| 733 | ** See also: export |
| 734 | */ |
| 735 | void git_import_cmd(void){ |
| 736 | char *zPassword; |
| 737 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -723,14 +723,16 @@ | |
| 723 | ** The git-fast-export file format is currently the only VCS interchange |
| 724 | ** format that is understood, though other interchange formats may be added |
| 725 | ** in the future. |
| 726 | ** |
| 727 | ** The --incremental option allows an existing repository to be extended |
| 728 | ** with new content. Otherwise, if a file with the same name as NEW-REPOSITORY |
| 729 | ** is found, the command fails unless the --force option is used. |
| 730 | ** |
| 731 | ** Options: |
| 732 | ** --incremental allow importing into an existing repository |
| 733 | ** --force remove existing file |
| 734 | ** |
| 735 | ** See also: export |
| 736 | */ |
| 737 | void git_import_cmd(void){ |
| 738 | char *zPassword; |
| 739 |