Fossil SCM

Improved consistency for --help option descriptions.

km 2022-12-21 09:31 trunk
Commit 2e56ef4e8dd0402927df0e79e5af558fb8044194f9680ea7bf87cf5680b9feff
Parent 43601b3d1241bd8…
36 files changed +4 -4 +4 -4 +3 -3 +3 -3 +2 -2 +2 -2 +1 -1 +53 -53 +53 -53 +6 -6 +6 -6 +3 -3 +3 -3 +7 -7 +7 -7 +9 -9 +9 -9 +16 -16 +16 -16 +3 -3 +3 -3 +6 -6 +6 -6 +13 -13 +13 -13 +5 -5 +4 -4 +2 -2 +1 -1 +3 -3 +10 -10 +10 -10 +1 -1 +1 -1 +1 -1 +1 -1
~ src/add.c ~ src/add.c ~ src/allrepo.c ~ src/allrepo.c ~ src/backoffice.c ~ src/backoffice.c ~ src/chat.c ~ src/checkin.c ~ src/checkin.c ~ src/db.c ~ src/db.c ~ src/export.c ~ src/export.c ~ src/file.c ~ src/file.c ~ src/import.c ~ src/import.c ~ src/main.c ~ src/main.c ~ src/merge.c ~ src/merge.c ~ src/patch.c ~ src/patch.c ~ src/pikchrshow.c ~ src/pikchrshow.c ~ src/rebuild.c ~ src/rss.c ~ src/search.c ~ src/sqlcmd.c ~ src/stat.c ~ src/tag.c ~ src/tag.c ~ src/timeline.c ~ src/timeline.c ~ src/undo.c ~ src/undo.c
M src/add.c
+4 -4
--- src/add.c
+++ src/add.c
@@ -583,12 +583,12 @@
583583
 ** This does NOT apply to the 'forget' command.
584584
 **
585585
 ** Options:
586586
 ** --soft Skip removing files from the checkout.
587587
 ** This supersedes the --hard option.
588
-** --hard Remove files from the checkout.
589
-** --case-sensitive BOOL Override the case-sensitive setting.
588
+** --hard Remove files from the check-out
589
+** --case-sensitive BOOL Override the case-sensitive setting
590590
 ** -n|--dry-run If given, display instead of run actions.
591591
 ** --reset Reset the DELETED state of a checkout, such
592592
 ** that all newly-rm'd (but not yet committed)
593593
 ** files are no longer removed. No flags other
594594
 ** than --verbose or --dry-run may be used with
@@ -770,17 +770,17 @@
770770
 ** anything.
771771
 **
772772
 ** This command can be used to track third party software.
773773
 **
774774
 ** Options:
775
-** --case-sensitive BOOL Override the case-sensitive setting.
775
+** --case-sensitive BOOL Override the case-sensitive setting
776776
 ** --dotfiles Include files beginning with a dot (".")
777777
 ** --ignore CSG Ignore unmanaged files matching patterns from
778778
 ** the Comma Separated Glob (CSG) list
779779
 ** --clean CSG Also ignore files matching patterns from
780780
 ** the Comma Separated Glob (CSG) list
781
-** -n|--dry-run If given, display instead of run actions.
781
+** -n|--dry-run If given, display instead of run actions
782782
 ** --reset Reset the ADDED/DELETED state of a checkout,
783783
 ** such that all newly-added (but not yet committed)
784784
 ** files are no longer added and all newly-removed
785785
 ** (but not yet committed) files are no longer
786786
 ** removed. No flags other than --verbose and
787787
--- src/add.c
+++ src/add.c
@@ -583,12 +583,12 @@
583 ** This does NOT apply to the 'forget' command.
584 **
585 ** Options:
586 ** --soft Skip removing files from the checkout.
587 ** This supersedes the --hard option.
588 ** --hard Remove files from the checkout.
589 ** --case-sensitive BOOL Override the case-sensitive setting.
590 ** -n|--dry-run If given, display instead of run actions.
591 ** --reset Reset the DELETED state of a checkout, such
592 ** that all newly-rm'd (but not yet committed)
593 ** files are no longer removed. No flags other
594 ** than --verbose or --dry-run may be used with
@@ -770,17 +770,17 @@
770 ** anything.
771 **
772 ** This command can be used to track third party software.
773 **
774 ** Options:
775 ** --case-sensitive BOOL Override the case-sensitive setting.
776 ** --dotfiles Include files beginning with a dot (".")
777 ** --ignore CSG Ignore unmanaged files matching patterns from
778 ** the Comma Separated Glob (CSG) list
779 ** --clean CSG Also ignore files matching patterns from
780 ** the Comma Separated Glob (CSG) list
781 ** -n|--dry-run If given, display instead of run actions.
782 ** --reset Reset the ADDED/DELETED state of a checkout,
783 ** such that all newly-added (but not yet committed)
784 ** files are no longer added and all newly-removed
785 ** (but not yet committed) files are no longer
786 ** removed. No flags other than --verbose and
787
--- src/add.c
+++ src/add.c
@@ -583,12 +583,12 @@
583 ** This does NOT apply to the 'forget' command.
584 **
585 ** Options:
586 ** --soft Skip removing files from the checkout.
587 ** This supersedes the --hard option.
588 ** --hard Remove files from the check-out
589 ** --case-sensitive BOOL Override the case-sensitive setting
590 ** -n|--dry-run If given, display instead of run actions.
591 ** --reset Reset the DELETED state of a checkout, such
592 ** that all newly-rm'd (but not yet committed)
593 ** files are no longer removed. No flags other
594 ** than --verbose or --dry-run may be used with
@@ -770,17 +770,17 @@
770 ** anything.
771 **
772 ** This command can be used to track third party software.
773 **
774 ** Options:
775 ** --case-sensitive BOOL Override the case-sensitive setting
776 ** --dotfiles Include files beginning with a dot (".")
777 ** --ignore CSG Ignore unmanaged files matching patterns from
778 ** the Comma Separated Glob (CSG) list
779 ** --clean CSG Also ignore files matching patterns from
780 ** the Comma Separated Glob (CSG) list
781 ** -n|--dry-run If given, display instead of run actions
782 ** --reset Reset the ADDED/DELETED state of a checkout,
783 ** such that all newly-added (but not yet committed)
784 ** files are no longer added and all newly-removed
785 ** (but not yet committed) files are no longer
786 ** removed. No flags other than --verbose and
787
M src/add.c
+4 -4
--- src/add.c
+++ src/add.c
@@ -583,12 +583,12 @@
583583
 ** This does NOT apply to the 'forget' command.
584584
 **
585585
 ** Options:
586586
 ** --soft Skip removing files from the checkout.
587587
 ** This supersedes the --hard option.
588
-** --hard Remove files from the checkout.
589
-** --case-sensitive BOOL Override the case-sensitive setting.
588
+** --hard Remove files from the check-out
589
+** --case-sensitive BOOL Override the case-sensitive setting
590590
 ** -n|--dry-run If given, display instead of run actions.
591591
 ** --reset Reset the DELETED state of a checkout, such
592592
 ** that all newly-rm'd (but not yet committed)
593593
 ** files are no longer removed. No flags other
594594
 ** than --verbose or --dry-run may be used with
@@ -770,17 +770,17 @@
770770
 ** anything.
771771
 **
772772
 ** This command can be used to track third party software.
773773
 **
774774
 ** Options:
775
-** --case-sensitive BOOL Override the case-sensitive setting.
775
+** --case-sensitive BOOL Override the case-sensitive setting
776776
 ** --dotfiles Include files beginning with a dot (".")
777777
 ** --ignore CSG Ignore unmanaged files matching patterns from
778778
 ** the Comma Separated Glob (CSG) list
779779
 ** --clean CSG Also ignore files matching patterns from
780780
 ** the Comma Separated Glob (CSG) list
781
-** -n|--dry-run If given, display instead of run actions.
781
+** -n|--dry-run If given, display instead of run actions
782782
 ** --reset Reset the ADDED/DELETED state of a checkout,
783783
 ** such that all newly-added (but not yet committed)
784784
 ** files are no longer added and all newly-removed
785785
 ** (but not yet committed) files are no longer
786786
 ** removed. No flags other than --verbose and
787787
--- src/add.c
+++ src/add.c
@@ -583,12 +583,12 @@
583 ** This does NOT apply to the 'forget' command.
584 **
585 ** Options:
586 ** --soft Skip removing files from the checkout.
587 ** This supersedes the --hard option.
588 ** --hard Remove files from the checkout.
589 ** --case-sensitive BOOL Override the case-sensitive setting.
590 ** -n|--dry-run If given, display instead of run actions.
591 ** --reset Reset the DELETED state of a checkout, such
592 ** that all newly-rm'd (but not yet committed)
593 ** files are no longer removed. No flags other
594 ** than --verbose or --dry-run may be used with
@@ -770,17 +770,17 @@
770 ** anything.
771 **
772 ** This command can be used to track third party software.
773 **
774 ** Options:
775 ** --case-sensitive BOOL Override the case-sensitive setting.
776 ** --dotfiles Include files beginning with a dot (".")
777 ** --ignore CSG Ignore unmanaged files matching patterns from
778 ** the Comma Separated Glob (CSG) list
779 ** --clean CSG Also ignore files matching patterns from
780 ** the Comma Separated Glob (CSG) list
781 ** -n|--dry-run If given, display instead of run actions.
782 ** --reset Reset the ADDED/DELETED state of a checkout,
783 ** such that all newly-added (but not yet committed)
784 ** files are no longer added and all newly-removed
785 ** (but not yet committed) files are no longer
786 ** removed. No flags other than --verbose and
787
--- src/add.c
+++ src/add.c
@@ -583,12 +583,12 @@
583 ** This does NOT apply to the 'forget' command.
584 **
585 ** Options:
586 ** --soft Skip removing files from the checkout.
587 ** This supersedes the --hard option.
588 ** --hard Remove files from the check-out
589 ** --case-sensitive BOOL Override the case-sensitive setting
590 ** -n|--dry-run If given, display instead of run actions.
591 ** --reset Reset the DELETED state of a checkout, such
592 ** that all newly-rm'd (but not yet committed)
593 ** files are no longer removed. No flags other
594 ** than --verbose or --dry-run may be used with
@@ -770,17 +770,17 @@
770 ** anything.
771 **
772 ** This command can be used to track third party software.
773 **
774 ** Options:
775 ** --case-sensitive BOOL Override the case-sensitive setting
776 ** --dotfiles Include files beginning with a dot (".")
777 ** --ignore CSG Ignore unmanaged files matching patterns from
778 ** the Comma Separated Glob (CSG) list
779 ** --clean CSG Also ignore files matching patterns from
780 ** the Comma Separated Glob (CSG) list
781 ** -n|--dry-run If given, display instead of run actions
782 ** --reset Reset the ADDED/DELETED state of a checkout,
783 ** such that all newly-added (but not yet committed)
784 ** files are no longer added and all newly-removed
785 ** (but not yet committed) files are no longer
786 ** removed. No flags other than --verbose and
787
M src/allrepo.c
+3 -3
--- src/allrepo.c
+++ src/allrepo.c
@@ -148,13 +148,13 @@
148148
 ** when one of the following commands are run against the repository:
149149
 ** clone, info, pull, push, or sync. Even previously ignored repositories
150150
 ** are added back to the list of repositories by these commands.
151151
 **
152152
 ** Options:
153
-** --dry-run If given, display instead of run actions.
154
-** --showfile Show the repository or checkout being operated upon.
155
-** --stop-on-error Halt immediately if any subprocess fails.
153
+** --dry-run If given, display instead of run actions
154
+** --showfile Show the repository or check-out being operated upon
155
+** --stop-on-error Halt immediately if any subprocess fails
156156
 */
157157
 void all_cmd(void){
158158
 Stmt q;
159159
 const char *zCmd;
160160
 char *zSyscmd;
161161
--- src/allrepo.c
+++ src/allrepo.c
@@ -148,13 +148,13 @@
148 ** when one of the following commands are run against the repository:
149 ** clone, info, pull, push, or sync. Even previously ignored repositories
150 ** are added back to the list of repositories by these commands.
151 **
152 ** Options:
153 ** --dry-run If given, display instead of run actions.
154 ** --showfile Show the repository or checkout being operated upon.
155 ** --stop-on-error Halt immediately if any subprocess fails.
156 */
157 void all_cmd(void){
158 Stmt q;
159 const char *zCmd;
160 char *zSyscmd;
161
--- src/allrepo.c
+++ src/allrepo.c
@@ -148,13 +148,13 @@
148 ** when one of the following commands are run against the repository:
149 ** clone, info, pull, push, or sync. Even previously ignored repositories
150 ** are added back to the list of repositories by these commands.
151 **
152 ** Options:
153 ** --dry-run If given, display instead of run actions
154 ** --showfile Show the repository or check-out being operated upon
155 ** --stop-on-error Halt immediately if any subprocess fails
156 */
157 void all_cmd(void){
158 Stmt q;
159 const char *zCmd;
160 char *zSyscmd;
161
M src/allrepo.c
+3 -3
--- src/allrepo.c
+++ src/allrepo.c
@@ -148,13 +148,13 @@
148148
 ** when one of the following commands are run against the repository:
149149
 ** clone, info, pull, push, or sync. Even previously ignored repositories
150150
 ** are added back to the list of repositories by these commands.
151151
 **
152152
 ** Options:
153
-** --dry-run If given, display instead of run actions.
154
-** --showfile Show the repository or checkout being operated upon.
155
-** --stop-on-error Halt immediately if any subprocess fails.
153
+** --dry-run If given, display instead of run actions
154
+** --showfile Show the repository or check-out being operated upon
155
+** --stop-on-error Halt immediately if any subprocess fails
156156
 */
157157
 void all_cmd(void){
158158
 Stmt q;
159159
 const char *zCmd;
160160
 char *zSyscmd;
161161
--- src/allrepo.c
+++ src/allrepo.c
@@ -148,13 +148,13 @@
148 ** when one of the following commands are run against the repository:
149 ** clone, info, pull, push, or sync. Even previously ignored repositories
150 ** are added back to the list of repositories by these commands.
151 **
152 ** Options:
153 ** --dry-run If given, display instead of run actions.
154 ** --showfile Show the repository or checkout being operated upon.
155 ** --stop-on-error Halt immediately if any subprocess fails.
156 */
157 void all_cmd(void){
158 Stmt q;
159 const char *zCmd;
160 char *zSyscmd;
161
--- src/allrepo.c
+++ src/allrepo.c
@@ -148,13 +148,13 @@
148 ** when one of the following commands are run against the repository:
149 ** clone, info, pull, push, or sync. Even previously ignored repositories
150 ** are added back to the list of repositories by these commands.
151 **
152 ** Options:
153 ** --dry-run If given, display instead of run actions
154 ** --showfile Show the repository or check-out being operated upon
155 ** --stop-on-error Halt immediately if any subprocess fails
156 */
157 void all_cmd(void){
158 Stmt q;
159 const char *zCmd;
160 char *zSyscmd;
161
M src/backoffice.c
+2 -2
--- src/backoffice.c
+++ src/backoffice.c
@@ -680,13 +680,13 @@
680680
 ** or if --poll is used, a separate sub-process is started for each poll of
681681
 ** each repository.
682682
 **
683683
 ** Standard options:
684684
 **
685
-** --debug Show what this command is doing.
685
+** --debug Show what this command is doing
686686
 **
687
-** --logfile FILE Append a log of backoffice actions onto FILE.
687
+** --logfile FILE Append a log of backoffice actions onto FILE
688688
 **
689689
 ** --min N When polling, invoke backoffice at least
690690
 ** once every N seconds even if the repository
691691
 ** never changes. 0 or negative means disable
692692
 ** this feature. Default: 3600 (once per hour).
693693
--- src/backoffice.c
+++ src/backoffice.c
@@ -680,13 +680,13 @@
680 ** or if --poll is used, a separate sub-process is started for each poll of
681 ** each repository.
682 **
683 ** Standard options:
684 **
685 ** --debug Show what this command is doing.
686 **
687 ** --logfile FILE Append a log of backoffice actions onto FILE.
688 **
689 ** --min N When polling, invoke backoffice at least
690 ** once every N seconds even if the repository
691 ** never changes. 0 or negative means disable
692 ** this feature. Default: 3600 (once per hour).
693
--- src/backoffice.c
+++ src/backoffice.c
@@ -680,13 +680,13 @@
680 ** or if --poll is used, a separate sub-process is started for each poll of
681 ** each repository.
682 **
683 ** Standard options:
684 **
685 ** --debug Show what this command is doing
686 **
687 ** --logfile FILE Append a log of backoffice actions onto FILE
688 **
689 ** --min N When polling, invoke backoffice at least
690 ** once every N seconds even if the repository
691 ** never changes. 0 or negative means disable
692 ** this feature. Default: 3600 (once per hour).
693
M src/backoffice.c
+2 -2
--- src/backoffice.c
+++ src/backoffice.c
@@ -680,13 +680,13 @@
680680
 ** or if --poll is used, a separate sub-process is started for each poll of
681681
 ** each repository.
682682
 **
683683
 ** Standard options:
684684
 **
685
-** --debug Show what this command is doing.
685
+** --debug Show what this command is doing
686686
 **
687
-** --logfile FILE Append a log of backoffice actions onto FILE.
687
+** --logfile FILE Append a log of backoffice actions onto FILE
688688
 **
689689
 ** --min N When polling, invoke backoffice at least
690690
 ** once every N seconds even if the repository
691691
 ** never changes. 0 or negative means disable
692692
 ** this feature. Default: 3600 (once per hour).
693693
--- src/backoffice.c
+++ src/backoffice.c
@@ -680,13 +680,13 @@
680 ** or if --poll is used, a separate sub-process is started for each poll of
681 ** each repository.
682 **
683 ** Standard options:
684 **
685 ** --debug Show what this command is doing.
686 **
687 ** --logfile FILE Append a log of backoffice actions onto FILE.
688 **
689 ** --min N When polling, invoke backoffice at least
690 ** once every N seconds even if the repository
691 ** never changes. 0 or negative means disable
692 ** this feature. Default: 3600 (once per hour).
693
--- src/backoffice.c
+++ src/backoffice.c
@@ -680,13 +680,13 @@
680 ** or if --poll is used, a separate sub-process is started for each poll of
681 ** each repository.
682 **
683 ** Standard options:
684 **
685 ** --debug Show what this command is doing
686 **
687 ** --logfile FILE Append a log of backoffice actions onto FILE
688 **
689 ** --min N When polling, invoke backoffice at least
690 ** once every N seconds even if the repository
691 ** never changes. 0 or negative means disable
692 ** this feature. Default: 3600 (once per hour).
693
M src/chat.c
+1 -1
--- src/chat.c
+++ src/chat.c
@@ -1038,11 +1038,11 @@
10381038
 ** Copy chat content from the server down into the local clone,
10391039
 ** as a backup or archive. Setup privilege is required on the server.
10401040
 **
10411041
 ** --all Download all chat content. Normally only
10421042
 ** previously undownloaded content is retrieved.
1043
-** --debug Additional debugging output.
1043
+** --debug Additional debugging output
10441044
 ** --out DATABASE Store CHAT table in separate database file
10451045
 ** DATABASE rather that adding to local clone
10461046
 ** --unsafe Allow the use of unencrypted http://
10471047
 **
10481048
 ** > fossil chat send [ARGUMENTS]
10491049
--- src/chat.c
+++ src/chat.c
@@ -1038,11 +1038,11 @@
1038 ** Copy chat content from the server down into the local clone,
1039 ** as a backup or archive. Setup privilege is required on the server.
1040 **
1041 ** --all Download all chat content. Normally only
1042 ** previously undownloaded content is retrieved.
1043 ** --debug Additional debugging output.
1044 ** --out DATABASE Store CHAT table in separate database file
1045 ** DATABASE rather that adding to local clone
1046 ** --unsafe Allow the use of unencrypted http://
1047 **
1048 ** > fossil chat send [ARGUMENTS]
1049
--- src/chat.c
+++ src/chat.c
@@ -1038,11 +1038,11 @@
1038 ** Copy chat content from the server down into the local clone,
1039 ** as a backup or archive. Setup privilege is required on the server.
1040 **
1041 ** --all Download all chat content. Normally only
1042 ** previously undownloaded content is retrieved.
1043 ** --debug Additional debugging output
1044 ** --out DATABASE Store CHAT table in separate database file
1045 ** DATABASE rather that adding to local clone
1046 ** --unsafe Allow the use of unencrypted http://
1047 **
1048 ** > fossil chat send [ARGUMENTS]
1049
M src/checkin.c
+53 -53
--- src/checkin.c
+++ src/checkin.c
@@ -421,41 +421,41 @@
421421
 ** same is true of --classify and --no-classify.
422422
 **
423423
 ** The "fossil changes --extra" command is equivalent to "fossil extras".
424424
 **
425425
 ** General options:
426
-** --abs-paths Display absolute pathnames.
426
+** --abs-paths Display absolute pathnames
427427
 ** --rel-paths Display pathnames relative to the current working
428
-** directory.
428
+** directory
429429
 ** --hash Verify file status using hashing rather than
430
-** relying on file mtimes.
431
-** --case-sensitive BOOL Override case-sensitive setting.
432
-** --dotfiles Include unmanaged files beginning with a dot.
433
-** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns.
430
+** relying on file mtimes
431
+** --case-sensitive BOOL Override case-sensitive setting
432
+** --dotfiles Include unmanaged files beginning with a dot
433
+** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns
434434
 **
435435
 ** Options specific to the changes command:
436
-** --header Identify the repository if report is non-empty.
437
-** -v|--verbose Say "(none)" if the change report is empty.
438
-** --classify Start each line with the file's change type.
439
-** --no-classify Do not print file change types.
436
+** --header Identify the repository if report is non-empty
437
+** -v|--verbose Say "(none)" if the change report is empty
438
+** --classify Start each line with the file's change type
439
+** --no-classify Do not print file change types
440440
 **
441441
 ** Filter options:
442
-** --edited Display edited, merged, and conflicted files.
443
-** --updated Display files updated by merge/integrate.
444
-** --changed Combination of the above two options.
445
-** --missing Display missing files.
446
-** --added Display added files.
447
-** --deleted Display deleted files.
448
-** --renamed Display renamed files.
449
-** --conflict Display files having merge conflicts.
450
-** --meta Display files with metadata changes.
451
-** --unchanged Display unchanged files.
452
-** --all Display all managed files, i.e. all of the above.
453
-** --extra Display unmanaged files.
454
-** --differ Display modified and extra files.
455
-** --merge Display merge contributors.
456
-** --no-merge Do not display merge contributors.
442
+** --edited Display edited, merged, and conflicted files
443
+** --updated Display files updated by merge/integrate
444
+** --changed Combination of the above two options
445
+** --missing Display missing files
446
+** --added Display added files
447
+** --deleted Display deleted files
448
+** --renamed Display renamed files
449
+** --conflict Display files having merge conflicts
450
+** --meta Display files with metadata changes
451
+** --unchanged Display unchanged files
452
+** --all Display all managed files, i.e. all of the above
453
+** --extra Display unmanaged files
454
+** --differ Display modified and extra files
455
+** --merge Display merge contributors
456
+** --no-merge Do not display merge contributors
457457
 **
458458
 ** See also: [[extras]], [[ls]]
459459
 */
460460
 void status_cmd(void){
461461
 /* Affirmative and negative flag option tables. */
@@ -683,17 +683,17 @@
683683
 ** The -t option changes the sort order. Without -t, files are sorted by
684684
 ** path and name (case insensitive sort if -r). If neither --age nor -r
685685
 ** are used, -t sorts by modification time, otherwise by commit time.
686686
 **
687687
 ** Options:
688
-** --age Show when each file was committed.
689
-** -v|--verbose Provide extra information about each file.
690
-** -t Sort output in time order.
691
-** -r VERSION The specific check-in to list.
692
-** -R|--repository REPO Extract info from repository REPO.
688
+** --age Show when each file was committed
689
+** -v|--verbose Provide extra information about each file
690
+** -t Sort output in time order
691
+** -r VERSION The specific check-in to list
692
+** -R|--repository REPO Extract info from repository REPO
693693
 ** --hash With -v, verify file status using hashing
694
-** rather than relying on file sizes and mtimes.
694
+** rather than relying on file sizes and mtimes
695695
 **
696696
 ** See also: [[changes]], [[extras]], [[status]]
697697
 */
698698
 void ls_cmd(void){
699699
 int vid;
@@ -2148,46 +2148,46 @@
21482148
 **
21492149
 ** The --hash option detects edited files by computing each file's
21502150
 ** artifact hash rather than just checking for changes to its size or mtime.
21512151
 **
21522152
 ** Options:
2153
-** --allow-conflict allow unresolved merge conflicts
2154
-** --allow-empty allow a commit with no changes
2155
-** --allow-fork allow the commit to fork
2156
-** --allow-older allow a commit older than its ancestor
2157
-** --baseline use a baseline manifest in the commit process
2158
-** --bgcolor COLOR apply COLOR to this one check-in only
2159
-** --branch NEW-BRANCH-NAME check in to this new branch
2160
-** --branchcolor COLOR apply given COLOR to the branch
2153
+** --allow-conflict Allow unresolved merge conflicts
2154
+** --allow-empty Allow a commit with no changes
2155
+** --allow-fork Allow the commit to fork
2156
+** --allow-older Allow a commit older than its ancestor
2157
+** --baseline Use a baseline manifest in the commit process
2158
+** --bgcolor COLOR Apply COLOR to this one check-in only
2159
+** --branch NEW-BRANCH-NAME Check in to this new branch
2160
+** --branchcolor COLOR Apply given COLOR to the branch
21612161
 ** ("auto" lets Fossil choose it automatically,
21622162
 ** even for private branches)
2163
-** --close close the branch being committed
2163
+** --close Close the branch being committed
21642164
 ** --date-override DATETIME DATE to use instead of 'now'
2165
-** --delta use a delta manifest in the commit process
2166
-** --hash verify file status using hashing rather
2165
+** --delta Use a delta manifest in the commit process
2166
+** --hash Verify file status using hashing rather
21672167
 ** than relying on file mtimes
21682168
 ** --ignore-clock-skew If a clock skew is detected, ignore it and
21692169
 ** behave as if the user had entered 'yes' to
21702170
 ** the question of whether to proceed despite
21712171
 ** the skew.
21722172
 ** --ignore-oversize Do not warning the user about oversized files
2173
-** --integrate close all merged-in branches
2174
-** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
2175
-** -M|--message-file FILE read the commit comment from given file
2176
-** --mimetype MIMETYPE mimetype of check-in comment
2173
+** --integrate Close all merged-in branches
2174
+** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2175
+** -M|--message-file FILE Read the commit comment from given file
2176
+** --mimetype MIMETYPE Mimetype of check-in comment
21772177
 ** -n|--dry-run If given, display instead of run actions
21782178
 ** -v|--verbose Show a diff in the commit message prompt
21792179
 ** --no-prompt This option disables prompting the user for
21802180
 ** input and assumes an answer of 'No' for every
21812181
 ** question.
2182
-** --no-warnings omit all warnings about file contents
2183
-** --no-verify do not run before-commit hooks
2184
-** --nosign do not attempt to sign this commit with gpg
2185
-** --override-lock allow a check-in even though parent is locked
2186
-** --private do not sync changes and their descendants
2187
-** --tag TAG-NAME assign given tag TAG-NAME to the check-in
2188
-** --trace debug tracing.
2182
+** --no-warnings Omit all warnings about file contents
2183
+** --no-verify Do not run before-commit hooks
2184
+** --nosign Do not attempt to sign this commit with gpg
2185
+** --override-lock Allow a check-in even though parent is locked
2186
+** --private Do not sync changes and their descendants
2187
+** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2188
+** --trace Debug tracing
21892189
 ** --user-override USER USER to use instead of the current default
21902190
 **
21912191
 ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
21922192
 ** year-month-day form, it may be truncated, the "T" may be replaced by
21932193
 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
21942194
--- src/checkin.c
+++ src/checkin.c
@@ -421,41 +421,41 @@
421 ** same is true of --classify and --no-classify.
422 **
423 ** The "fossil changes --extra" command is equivalent to "fossil extras".
424 **
425 ** General options:
426 ** --abs-paths Display absolute pathnames.
427 ** --rel-paths Display pathnames relative to the current working
428 ** directory.
429 ** --hash Verify file status using hashing rather than
430 ** relying on file mtimes.
431 ** --case-sensitive BOOL Override case-sensitive setting.
432 ** --dotfiles Include unmanaged files beginning with a dot.
433 ** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns.
434 **
435 ** Options specific to the changes command:
436 ** --header Identify the repository if report is non-empty.
437 ** -v|--verbose Say "(none)" if the change report is empty.
438 ** --classify Start each line with the file's change type.
439 ** --no-classify Do not print file change types.
440 **
441 ** Filter options:
442 ** --edited Display edited, merged, and conflicted files.
443 ** --updated Display files updated by merge/integrate.
444 ** --changed Combination of the above two options.
445 ** --missing Display missing files.
446 ** --added Display added files.
447 ** --deleted Display deleted files.
448 ** --renamed Display renamed files.
449 ** --conflict Display files having merge conflicts.
450 ** --meta Display files with metadata changes.
451 ** --unchanged Display unchanged files.
452 ** --all Display all managed files, i.e. all of the above.
453 ** --extra Display unmanaged files.
454 ** --differ Display modified and extra files.
455 ** --merge Display merge contributors.
456 ** --no-merge Do not display merge contributors.
457 **
458 ** See also: [[extras]], [[ls]]
459 */
460 void status_cmd(void){
461 /* Affirmative and negative flag option tables. */
@@ -683,17 +683,17 @@
683 ** The -t option changes the sort order. Without -t, files are sorted by
684 ** path and name (case insensitive sort if -r). If neither --age nor -r
685 ** are used, -t sorts by modification time, otherwise by commit time.
686 **
687 ** Options:
688 ** --age Show when each file was committed.
689 ** -v|--verbose Provide extra information about each file.
690 ** -t Sort output in time order.
691 ** -r VERSION The specific check-in to list.
692 ** -R|--repository REPO Extract info from repository REPO.
693 ** --hash With -v, verify file status using hashing
694 ** rather than relying on file sizes and mtimes.
695 **
696 ** See also: [[changes]], [[extras]], [[status]]
697 */
698 void ls_cmd(void){
699 int vid;
@@ -2148,46 +2148,46 @@
2148 **
2149 ** The --hash option detects edited files by computing each file's
2150 ** artifact hash rather than just checking for changes to its size or mtime.
2151 **
2152 ** Options:
2153 ** --allow-conflict allow unresolved merge conflicts
2154 ** --allow-empty allow a commit with no changes
2155 ** --allow-fork allow the commit to fork
2156 ** --allow-older allow a commit older than its ancestor
2157 ** --baseline use a baseline manifest in the commit process
2158 ** --bgcolor COLOR apply COLOR to this one check-in only
2159 ** --branch NEW-BRANCH-NAME check in to this new branch
2160 ** --branchcolor COLOR apply given COLOR to the branch
2161 ** ("auto" lets Fossil choose it automatically,
2162 ** even for private branches)
2163 ** --close close the branch being committed
2164 ** --date-override DATETIME DATE to use instead of 'now'
2165 ** --delta use a delta manifest in the commit process
2166 ** --hash verify file status using hashing rather
2167 ** than relying on file mtimes
2168 ** --ignore-clock-skew If a clock skew is detected, ignore it and
2169 ** behave as if the user had entered 'yes' to
2170 ** the question of whether to proceed despite
2171 ** the skew.
2172 ** --ignore-oversize Do not warning the user about oversized files
2173 ** --integrate close all merged-in branches
2174 ** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
2175 ** -M|--message-file FILE read the commit comment from given file
2176 ** --mimetype MIMETYPE mimetype of check-in comment
2177 ** -n|--dry-run If given, display instead of run actions
2178 ** -v|--verbose Show a diff in the commit message prompt
2179 ** --no-prompt This option disables prompting the user for
2180 ** input and assumes an answer of 'No' for every
2181 ** question.
2182 ** --no-warnings omit all warnings about file contents
2183 ** --no-verify do not run before-commit hooks
2184 ** --nosign do not attempt to sign this commit with gpg
2185 ** --override-lock allow a check-in even though parent is locked
2186 ** --private do not sync changes and their descendants
2187 ** --tag TAG-NAME assign given tag TAG-NAME to the check-in
2188 ** --trace debug tracing.
2189 ** --user-override USER USER to use instead of the current default
2190 **
2191 ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2192 ** year-month-day form, it may be truncated, the "T" may be replaced by
2193 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2194
--- src/checkin.c
+++ src/checkin.c
@@ -421,41 +421,41 @@
421 ** same is true of --classify and --no-classify.
422 **
423 ** The "fossil changes --extra" command is equivalent to "fossil extras".
424 **
425 ** General options:
426 ** --abs-paths Display absolute pathnames
427 ** --rel-paths Display pathnames relative to the current working
428 ** directory
429 ** --hash Verify file status using hashing rather than
430 ** relying on file mtimes
431 ** --case-sensitive BOOL Override case-sensitive setting
432 ** --dotfiles Include unmanaged files beginning with a dot
433 ** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns
434 **
435 ** Options specific to the changes command:
436 ** --header Identify the repository if report is non-empty
437 ** -v|--verbose Say "(none)" if the change report is empty
438 ** --classify Start each line with the file's change type
439 ** --no-classify Do not print file change types
440 **
441 ** Filter options:
442 ** --edited Display edited, merged, and conflicted files
443 ** --updated Display files updated by merge/integrate
444 ** --changed Combination of the above two options
445 ** --missing Display missing files
446 ** --added Display added files
447 ** --deleted Display deleted files
448 ** --renamed Display renamed files
449 ** --conflict Display files having merge conflicts
450 ** --meta Display files with metadata changes
451 ** --unchanged Display unchanged files
452 ** --all Display all managed files, i.e. all of the above
453 ** --extra Display unmanaged files
454 ** --differ Display modified and extra files
455 ** --merge Display merge contributors
456 ** --no-merge Do not display merge contributors
457 **
458 ** See also: [[extras]], [[ls]]
459 */
460 void status_cmd(void){
461 /* Affirmative and negative flag option tables. */
@@ -683,17 +683,17 @@
683 ** The -t option changes the sort order. Without -t, files are sorted by
684 ** path and name (case insensitive sort if -r). If neither --age nor -r
685 ** are used, -t sorts by modification time, otherwise by commit time.
686 **
687 ** Options:
688 ** --age Show when each file was committed
689 ** -v|--verbose Provide extra information about each file
690 ** -t Sort output in time order
691 ** -r VERSION The specific check-in to list
692 ** -R|--repository REPO Extract info from repository REPO
693 ** --hash With -v, verify file status using hashing
694 ** rather than relying on file sizes and mtimes
695 **
696 ** See also: [[changes]], [[extras]], [[status]]
697 */
698 void ls_cmd(void){
699 int vid;
@@ -2148,46 +2148,46 @@
2148 **
2149 ** The --hash option detects edited files by computing each file's
2150 ** artifact hash rather than just checking for changes to its size or mtime.
2151 **
2152 ** Options:
2153 ** --allow-conflict Allow unresolved merge conflicts
2154 ** --allow-empty Allow a commit with no changes
2155 ** --allow-fork Allow the commit to fork
2156 ** --allow-older Allow a commit older than its ancestor
2157 ** --baseline Use a baseline manifest in the commit process
2158 ** --bgcolor COLOR Apply COLOR to this one check-in only
2159 ** --branch NEW-BRANCH-NAME Check in to this new branch
2160 ** --branchcolor COLOR Apply given COLOR to the branch
2161 ** ("auto" lets Fossil choose it automatically,
2162 ** even for private branches)
2163 ** --close Close the branch being committed
2164 ** --date-override DATETIME DATE to use instead of 'now'
2165 ** --delta Use a delta manifest in the commit process
2166 ** --hash Verify file status using hashing rather
2167 ** than relying on file mtimes
2168 ** --ignore-clock-skew If a clock skew is detected, ignore it and
2169 ** behave as if the user had entered 'yes' to
2170 ** the question of whether to proceed despite
2171 ** the skew.
2172 ** --ignore-oversize Do not warning the user about oversized files
2173 ** --integrate Close all merged-in branches
2174 ** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2175 ** -M|--message-file FILE Read the commit comment from given file
2176 ** --mimetype MIMETYPE Mimetype of check-in comment
2177 ** -n|--dry-run If given, display instead of run actions
2178 ** -v|--verbose Show a diff in the commit message prompt
2179 ** --no-prompt This option disables prompting the user for
2180 ** input and assumes an answer of 'No' for every
2181 ** question.
2182 ** --no-warnings Omit all warnings about file contents
2183 ** --no-verify Do not run before-commit hooks
2184 ** --nosign Do not attempt to sign this commit with gpg
2185 ** --override-lock Allow a check-in even though parent is locked
2186 ** --private Do not sync changes and their descendants
2187 ** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2188 ** --trace Debug tracing
2189 ** --user-override USER USER to use instead of the current default
2190 **
2191 ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2192 ** year-month-day form, it may be truncated, the "T" may be replaced by
2193 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2194
M src/checkin.c
+53 -53
--- src/checkin.c
+++ src/checkin.c
@@ -421,41 +421,41 @@
421421
 ** same is true of --classify and --no-classify.
422422
 **
423423
 ** The "fossil changes --extra" command is equivalent to "fossil extras".
424424
 **
425425
 ** General options:
426
-** --abs-paths Display absolute pathnames.
426
+** --abs-paths Display absolute pathnames
427427
 ** --rel-paths Display pathnames relative to the current working
428
-** directory.
428
+** directory
429429
 ** --hash Verify file status using hashing rather than
430
-** relying on file mtimes.
431
-** --case-sensitive BOOL Override case-sensitive setting.
432
-** --dotfiles Include unmanaged files beginning with a dot.
433
-** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns.
430
+** relying on file mtimes
431
+** --case-sensitive BOOL Override case-sensitive setting
432
+** --dotfiles Include unmanaged files beginning with a dot
433
+** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns
434434
 **
435435
 ** Options specific to the changes command:
436
-** --header Identify the repository if report is non-empty.
437
-** -v|--verbose Say "(none)" if the change report is empty.
438
-** --classify Start each line with the file's change type.
439
-** --no-classify Do not print file change types.
436
+** --header Identify the repository if report is non-empty
437
+** -v|--verbose Say "(none)" if the change report is empty
438
+** --classify Start each line with the file's change type
439
+** --no-classify Do not print file change types
440440
 **
441441
 ** Filter options:
442
-** --edited Display edited, merged, and conflicted files.
443
-** --updated Display files updated by merge/integrate.
444
-** --changed Combination of the above two options.
445
-** --missing Display missing files.
446
-** --added Display added files.
447
-** --deleted Display deleted files.
448
-** --renamed Display renamed files.
449
-** --conflict Display files having merge conflicts.
450
-** --meta Display files with metadata changes.
451
-** --unchanged Display unchanged files.
452
-** --all Display all managed files, i.e. all of the above.
453
-** --extra Display unmanaged files.
454
-** --differ Display modified and extra files.
455
-** --merge Display merge contributors.
456
-** --no-merge Do not display merge contributors.
442
+** --edited Display edited, merged, and conflicted files
443
+** --updated Display files updated by merge/integrate
444
+** --changed Combination of the above two options
445
+** --missing Display missing files
446
+** --added Display added files
447
+** --deleted Display deleted files
448
+** --renamed Display renamed files
449
+** --conflict Display files having merge conflicts
450
+** --meta Display files with metadata changes
451
+** --unchanged Display unchanged files
452
+** --all Display all managed files, i.e. all of the above
453
+** --extra Display unmanaged files
454
+** --differ Display modified and extra files
455
+** --merge Display merge contributors
456
+** --no-merge Do not display merge contributors
457457
 **
458458
 ** See also: [[extras]], [[ls]]
459459
 */
460460
 void status_cmd(void){
461461
 /* Affirmative and negative flag option tables. */
@@ -683,17 +683,17 @@
683683
 ** The -t option changes the sort order. Without -t, files are sorted by
684684
 ** path and name (case insensitive sort if -r). If neither --age nor -r
685685
 ** are used, -t sorts by modification time, otherwise by commit time.
686686
 **
687687
 ** Options:
688
-** --age Show when each file was committed.
689
-** -v|--verbose Provide extra information about each file.
690
-** -t Sort output in time order.
691
-** -r VERSION The specific check-in to list.
692
-** -R|--repository REPO Extract info from repository REPO.
688
+** --age Show when each file was committed
689
+** -v|--verbose Provide extra information about each file
690
+** -t Sort output in time order
691
+** -r VERSION The specific check-in to list
692
+** -R|--repository REPO Extract info from repository REPO
693693
 ** --hash With -v, verify file status using hashing
694
-** rather than relying on file sizes and mtimes.
694
+** rather than relying on file sizes and mtimes
695695
 **
696696
 ** See also: [[changes]], [[extras]], [[status]]
697697
 */
698698
 void ls_cmd(void){
699699
 int vid;
@@ -2148,46 +2148,46 @@
21482148
 **
21492149
 ** The --hash option detects edited files by computing each file's
21502150
 ** artifact hash rather than just checking for changes to its size or mtime.
21512151
 **
21522152
 ** Options:
2153
-** --allow-conflict allow unresolved merge conflicts
2154
-** --allow-empty allow a commit with no changes
2155
-** --allow-fork allow the commit to fork
2156
-** --allow-older allow a commit older than its ancestor
2157
-** --baseline use a baseline manifest in the commit process
2158
-** --bgcolor COLOR apply COLOR to this one check-in only
2159
-** --branch NEW-BRANCH-NAME check in to this new branch
2160
-** --branchcolor COLOR apply given COLOR to the branch
2153
+** --allow-conflict Allow unresolved merge conflicts
2154
+** --allow-empty Allow a commit with no changes
2155
+** --allow-fork Allow the commit to fork
2156
+** --allow-older Allow a commit older than its ancestor
2157
+** --baseline Use a baseline manifest in the commit process
2158
+** --bgcolor COLOR Apply COLOR to this one check-in only
2159
+** --branch NEW-BRANCH-NAME Check in to this new branch
2160
+** --branchcolor COLOR Apply given COLOR to the branch
21612161
 ** ("auto" lets Fossil choose it automatically,
21622162
 ** even for private branches)
2163
-** --close close the branch being committed
2163
+** --close Close the branch being committed
21642164
 ** --date-override DATETIME DATE to use instead of 'now'
2165
-** --delta use a delta manifest in the commit process
2166
-** --hash verify file status using hashing rather
2165
+** --delta Use a delta manifest in the commit process
2166
+** --hash Verify file status using hashing rather
21672167
 ** than relying on file mtimes
21682168
 ** --ignore-clock-skew If a clock skew is detected, ignore it and
21692169
 ** behave as if the user had entered 'yes' to
21702170
 ** the question of whether to proceed despite
21712171
 ** the skew.
21722172
 ** --ignore-oversize Do not warning the user about oversized files
2173
-** --integrate close all merged-in branches
2174
-** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
2175
-** -M|--message-file FILE read the commit comment from given file
2176
-** --mimetype MIMETYPE mimetype of check-in comment
2173
+** --integrate Close all merged-in branches
2174
+** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2175
+** -M|--message-file FILE Read the commit comment from given file
2176
+** --mimetype MIMETYPE Mimetype of check-in comment
21772177
 ** -n|--dry-run If given, display instead of run actions
21782178
 ** -v|--verbose Show a diff in the commit message prompt
21792179
 ** --no-prompt This option disables prompting the user for
21802180
 ** input and assumes an answer of 'No' for every
21812181
 ** question.
2182
-** --no-warnings omit all warnings about file contents
2183
-** --no-verify do not run before-commit hooks
2184
-** --nosign do not attempt to sign this commit with gpg
2185
-** --override-lock allow a check-in even though parent is locked
2186
-** --private do not sync changes and their descendants
2187
-** --tag TAG-NAME assign given tag TAG-NAME to the check-in
2188
-** --trace debug tracing.
2182
+** --no-warnings Omit all warnings about file contents
2183
+** --no-verify Do not run before-commit hooks
2184
+** --nosign Do not attempt to sign this commit with gpg
2185
+** --override-lock Allow a check-in even though parent is locked
2186
+** --private Do not sync changes and their descendants
2187
+** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2188
+** --trace Debug tracing
21892189
 ** --user-override USER USER to use instead of the current default
21902190
 **
21912191
 ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
21922192
 ** year-month-day form, it may be truncated, the "T" may be replaced by
21932193
 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
21942194
--- src/checkin.c
+++ src/checkin.c
@@ -421,41 +421,41 @@
421 ** same is true of --classify and --no-classify.
422 **
423 ** The "fossil changes --extra" command is equivalent to "fossil extras".
424 **
425 ** General options:
426 ** --abs-paths Display absolute pathnames.
427 ** --rel-paths Display pathnames relative to the current working
428 ** directory.
429 ** --hash Verify file status using hashing rather than
430 ** relying on file mtimes.
431 ** --case-sensitive BOOL Override case-sensitive setting.
432 ** --dotfiles Include unmanaged files beginning with a dot.
433 ** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns.
434 **
435 ** Options specific to the changes command:
436 ** --header Identify the repository if report is non-empty.
437 ** -v|--verbose Say "(none)" if the change report is empty.
438 ** --classify Start each line with the file's change type.
439 ** --no-classify Do not print file change types.
440 **
441 ** Filter options:
442 ** --edited Display edited, merged, and conflicted files.
443 ** --updated Display files updated by merge/integrate.
444 ** --changed Combination of the above two options.
445 ** --missing Display missing files.
446 ** --added Display added files.
447 ** --deleted Display deleted files.
448 ** --renamed Display renamed files.
449 ** --conflict Display files having merge conflicts.
450 ** --meta Display files with metadata changes.
451 ** --unchanged Display unchanged files.
452 ** --all Display all managed files, i.e. all of the above.
453 ** --extra Display unmanaged files.
454 ** --differ Display modified and extra files.
455 ** --merge Display merge contributors.
456 ** --no-merge Do not display merge contributors.
457 **
458 ** See also: [[extras]], [[ls]]
459 */
460 void status_cmd(void){
461 /* Affirmative and negative flag option tables. */
@@ -683,17 +683,17 @@
683 ** The -t option changes the sort order. Without -t, files are sorted by
684 ** path and name (case insensitive sort if -r). If neither --age nor -r
685 ** are used, -t sorts by modification time, otherwise by commit time.
686 **
687 ** Options:
688 ** --age Show when each file was committed.
689 ** -v|--verbose Provide extra information about each file.
690 ** -t Sort output in time order.
691 ** -r VERSION The specific check-in to list.
692 ** -R|--repository REPO Extract info from repository REPO.
693 ** --hash With -v, verify file status using hashing
694 ** rather than relying on file sizes and mtimes.
695 **
696 ** See also: [[changes]], [[extras]], [[status]]
697 */
698 void ls_cmd(void){
699 int vid;
@@ -2148,46 +2148,46 @@
2148 **
2149 ** The --hash option detects edited files by computing each file's
2150 ** artifact hash rather than just checking for changes to its size or mtime.
2151 **
2152 ** Options:
2153 ** --allow-conflict allow unresolved merge conflicts
2154 ** --allow-empty allow a commit with no changes
2155 ** --allow-fork allow the commit to fork
2156 ** --allow-older allow a commit older than its ancestor
2157 ** --baseline use a baseline manifest in the commit process
2158 ** --bgcolor COLOR apply COLOR to this one check-in only
2159 ** --branch NEW-BRANCH-NAME check in to this new branch
2160 ** --branchcolor COLOR apply given COLOR to the branch
2161 ** ("auto" lets Fossil choose it automatically,
2162 ** even for private branches)
2163 ** --close close the branch being committed
2164 ** --date-override DATETIME DATE to use instead of 'now'
2165 ** --delta use a delta manifest in the commit process
2166 ** --hash verify file status using hashing rather
2167 ** than relying on file mtimes
2168 ** --ignore-clock-skew If a clock skew is detected, ignore it and
2169 ** behave as if the user had entered 'yes' to
2170 ** the question of whether to proceed despite
2171 ** the skew.
2172 ** --ignore-oversize Do not warning the user about oversized files
2173 ** --integrate close all merged-in branches
2174 ** -m|--comment COMMENT-TEXT use COMMENT-TEXT as commit comment
2175 ** -M|--message-file FILE read the commit comment from given file
2176 ** --mimetype MIMETYPE mimetype of check-in comment
2177 ** -n|--dry-run If given, display instead of run actions
2178 ** -v|--verbose Show a diff in the commit message prompt
2179 ** --no-prompt This option disables prompting the user for
2180 ** input and assumes an answer of 'No' for every
2181 ** question.
2182 ** --no-warnings omit all warnings about file contents
2183 ** --no-verify do not run before-commit hooks
2184 ** --nosign do not attempt to sign this commit with gpg
2185 ** --override-lock allow a check-in even though parent is locked
2186 ** --private do not sync changes and their descendants
2187 ** --tag TAG-NAME assign given tag TAG-NAME to the check-in
2188 ** --trace debug tracing.
2189 ** --user-override USER USER to use instead of the current default
2190 **
2191 ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2192 ** year-month-day form, it may be truncated, the "T" may be replaced by
2193 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2194
--- src/checkin.c
+++ src/checkin.c
@@ -421,41 +421,41 @@
421 ** same is true of --classify and --no-classify.
422 **
423 ** The "fossil changes --extra" command is equivalent to "fossil extras".
424 **
425 ** General options:
426 ** --abs-paths Display absolute pathnames
427 ** --rel-paths Display pathnames relative to the current working
428 ** directory
429 ** --hash Verify file status using hashing rather than
430 ** relying on file mtimes
431 ** --case-sensitive BOOL Override case-sensitive setting
432 ** --dotfiles Include unmanaged files beginning with a dot
433 ** --ignore <CSG> Ignore unmanaged files matching CSG glob patterns
434 **
435 ** Options specific to the changes command:
436 ** --header Identify the repository if report is non-empty
437 ** -v|--verbose Say "(none)" if the change report is empty
438 ** --classify Start each line with the file's change type
439 ** --no-classify Do not print file change types
440 **
441 ** Filter options:
442 ** --edited Display edited, merged, and conflicted files
443 ** --updated Display files updated by merge/integrate
444 ** --changed Combination of the above two options
445 ** --missing Display missing files
446 ** --added Display added files
447 ** --deleted Display deleted files
448 ** --renamed Display renamed files
449 ** --conflict Display files having merge conflicts
450 ** --meta Display files with metadata changes
451 ** --unchanged Display unchanged files
452 ** --all Display all managed files, i.e. all of the above
453 ** --extra Display unmanaged files
454 ** --differ Display modified and extra files
455 ** --merge Display merge contributors
456 ** --no-merge Do not display merge contributors
457 **
458 ** See also: [[extras]], [[ls]]
459 */
460 void status_cmd(void){
461 /* Affirmative and negative flag option tables. */
@@ -683,17 +683,17 @@
683 ** The -t option changes the sort order. Without -t, files are sorted by
684 ** path and name (case insensitive sort if -r). If neither --age nor -r
685 ** are used, -t sorts by modification time, otherwise by commit time.
686 **
687 ** Options:
688 ** --age Show when each file was committed
689 ** -v|--verbose Provide extra information about each file
690 ** -t Sort output in time order
691 ** -r VERSION The specific check-in to list
692 ** -R|--repository REPO Extract info from repository REPO
693 ** --hash With -v, verify file status using hashing
694 ** rather than relying on file sizes and mtimes
695 **
696 ** See also: [[changes]], [[extras]], [[status]]
697 */
698 void ls_cmd(void){
699 int vid;
@@ -2148,46 +2148,46 @@
2148 **
2149 ** The --hash option detects edited files by computing each file's
2150 ** artifact hash rather than just checking for changes to its size or mtime.
2151 **
2152 ** Options:
2153 ** --allow-conflict Allow unresolved merge conflicts
2154 ** --allow-empty Allow a commit with no changes
2155 ** --allow-fork Allow the commit to fork
2156 ** --allow-older Allow a commit older than its ancestor
2157 ** --baseline Use a baseline manifest in the commit process
2158 ** --bgcolor COLOR Apply COLOR to this one check-in only
2159 ** --branch NEW-BRANCH-NAME Check in to this new branch
2160 ** --branchcolor COLOR Apply given COLOR to the branch
2161 ** ("auto" lets Fossil choose it automatically,
2162 ** even for private branches)
2163 ** --close Close the branch being committed
2164 ** --date-override DATETIME DATE to use instead of 'now'
2165 ** --delta Use a delta manifest in the commit process
2166 ** --hash Verify file status using hashing rather
2167 ** than relying on file mtimes
2168 ** --ignore-clock-skew If a clock skew is detected, ignore it and
2169 ** behave as if the user had entered 'yes' to
2170 ** the question of whether to proceed despite
2171 ** the skew.
2172 ** --ignore-oversize Do not warning the user about oversized files
2173 ** --integrate Close all merged-in branches
2174 ** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment
2175 ** -M|--message-file FILE Read the commit comment from given file
2176 ** --mimetype MIMETYPE Mimetype of check-in comment
2177 ** -n|--dry-run If given, display instead of run actions
2178 ** -v|--verbose Show a diff in the commit message prompt
2179 ** --no-prompt This option disables prompting the user for
2180 ** input and assumes an answer of 'No' for every
2181 ** question.
2182 ** --no-warnings Omit all warnings about file contents
2183 ** --no-verify Do not run before-commit hooks
2184 ** --nosign Do not attempt to sign this commit with gpg
2185 ** --override-lock Allow a check-in even though parent is locked
2186 ** --private Do not sync changes and their descendants
2187 ** --tag TAG-NAME Assign given tag TAG-NAME to the check-in
2188 ** --trace Debug tracing
2189 ** --user-override USER USER to use instead of the current default
2190 **
2191 ** DATETIME may be "now" or "YYYY-MM-DDTHH:MM:SS.SSS". If in
2192 ** year-month-day form, it may be truncated, the "T" may be replaced by
2193 ** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2194
M src/db.c
+6 -6
--- src/db.c
+++ src/db.c
@@ -3687,11 +3687,11 @@
36873687
 ** Options:
36883688
 ** --empty Initialize checkout as being empty, but still connected
36893689
 ** with the local repository. If you commit this checkout,
36903690
 ** it will become a new "initial" commit in the repository.
36913691
 ** -f|--force Continue with the open even if the working directory is
3692
-** not empty.
3692
+** not empty
36933693
 ** --force-missing Force opening a repository with missing content
36943694
 ** -k|--keep Only modify the manifest file(s)
36953695
 ** --nested Allow opening a repository inside an opened checkout
36963696
 ** --nosync Do not auto-sync the repository prior to opening even
36973697
 ** if the autosync setting is on.
@@ -3699,13 +3699,13 @@
36993699
 ** the clone in DIR rather than in "."
37003700
 ** --setmtime Set timestamps of all files to match their SCM-side
37013701
 ** times (the timestamp of the last checkin which modified
37023702
 ** them).
37033703
 ** --sync Auto-sync prior to opening even if the autosync setting
3704
-** is off.
3704
+** is off
37053705
 ** --verbose If passed a URI then this flag is passed on to the clone
3706
-** operation, otherwise it has no effect.
3706
+** operation, otherwise it has no effect
37073707
 ** --workdir DIR Use DIR as the working directory instead of ".". The DIR
37083708
 ** directory is created if it does not exist.
37093709
 **
37103710
 ** See also: [[close]], [[clone]]
37113711
 */
@@ -4624,14 +4624,14 @@
46244624
 ** configuration database. If both a local and a global value exists for a
46254625
 ** setting, the local value takes precedence. This command normally operates
46264626
 ** on the local settings. Use the --global option to change global settings.
46274627
 **
46284628
 ** Options:
4629
-** --global set or unset the given property globally instead of
4630
-** setting or unsetting it for the open repository only.
4629
+** --global Set or unset the given property globally instead of
4630
+** setting or unsetting it for the open repository only
46314631
 **
4632
-** --exact only consider exact name matches.
4632
+** --exact Only consider exact name matches
46334633
 **
46344634
 ** See also: [[configuration]]
46354635
 */
46364636
 void setting_cmd(void){
46374637
 int i;
46384638
--- src/db.c
+++ src/db.c
@@ -3687,11 +3687,11 @@
3687 ** Options:
3688 ** --empty Initialize checkout as being empty, but still connected
3689 ** with the local repository. If you commit this checkout,
3690 ** it will become a new "initial" commit in the repository.
3691 ** -f|--force Continue with the open even if the working directory is
3692 ** not empty.
3693 ** --force-missing Force opening a repository with missing content
3694 ** -k|--keep Only modify the manifest file(s)
3695 ** --nested Allow opening a repository inside an opened checkout
3696 ** --nosync Do not auto-sync the repository prior to opening even
3697 ** if the autosync setting is on.
@@ -3699,13 +3699,13 @@
3699 ** the clone in DIR rather than in "."
3700 ** --setmtime Set timestamps of all files to match their SCM-side
3701 ** times (the timestamp of the last checkin which modified
3702 ** them).
3703 ** --sync Auto-sync prior to opening even if the autosync setting
3704 ** is off.
3705 ** --verbose If passed a URI then this flag is passed on to the clone
3706 ** operation, otherwise it has no effect.
3707 ** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3708 ** directory is created if it does not exist.
3709 **
3710 ** See also: [[close]], [[clone]]
3711 */
@@ -4624,14 +4624,14 @@
4624 ** configuration database. If both a local and a global value exists for a
4625 ** setting, the local value takes precedence. This command normally operates
4626 ** on the local settings. Use the --global option to change global settings.
4627 **
4628 ** Options:
4629 ** --global set or unset the given property globally instead of
4630 ** setting or unsetting it for the open repository only.
4631 **
4632 ** --exact only consider exact name matches.
4633 **
4634 ** See also: [[configuration]]
4635 */
4636 void setting_cmd(void){
4637 int i;
4638
--- src/db.c
+++ src/db.c
@@ -3687,11 +3687,11 @@
3687 ** Options:
3688 ** --empty Initialize checkout as being empty, but still connected
3689 ** with the local repository. If you commit this checkout,
3690 ** it will become a new "initial" commit in the repository.
3691 ** -f|--force Continue with the open even if the working directory is
3692 ** not empty
3693 ** --force-missing Force opening a repository with missing content
3694 ** -k|--keep Only modify the manifest file(s)
3695 ** --nested Allow opening a repository inside an opened checkout
3696 ** --nosync Do not auto-sync the repository prior to opening even
3697 ** if the autosync setting is on.
@@ -3699,13 +3699,13 @@
3699 ** the clone in DIR rather than in "."
3700 ** --setmtime Set timestamps of all files to match their SCM-side
3701 ** times (the timestamp of the last checkin which modified
3702 ** them).
3703 ** --sync Auto-sync prior to opening even if the autosync setting
3704 ** is off
3705 ** --verbose If passed a URI then this flag is passed on to the clone
3706 ** operation, otherwise it has no effect
3707 ** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3708 ** directory is created if it does not exist.
3709 **
3710 ** See also: [[close]], [[clone]]
3711 */
@@ -4624,14 +4624,14 @@
4624 ** configuration database. If both a local and a global value exists for a
4625 ** setting, the local value takes precedence. This command normally operates
4626 ** on the local settings. Use the --global option to change global settings.
4627 **
4628 ** Options:
4629 ** --global Set or unset the given property globally instead of
4630 ** setting or unsetting it for the open repository only
4631 **
4632 ** --exact Only consider exact name matches
4633 **
4634 ** See also: [[configuration]]
4635 */
4636 void setting_cmd(void){
4637 int i;
4638
M src/db.c
+6 -6
--- src/db.c
+++ src/db.c
@@ -3687,11 +3687,11 @@
36873687
 ** Options:
36883688
 ** --empty Initialize checkout as being empty, but still connected
36893689
 ** with the local repository. If you commit this checkout,
36903690
 ** it will become a new "initial" commit in the repository.
36913691
 ** -f|--force Continue with the open even if the working directory is
3692
-** not empty.
3692
+** not empty
36933693
 ** --force-missing Force opening a repository with missing content
36943694
 ** -k|--keep Only modify the manifest file(s)
36953695
 ** --nested Allow opening a repository inside an opened checkout
36963696
 ** --nosync Do not auto-sync the repository prior to opening even
36973697
 ** if the autosync setting is on.
@@ -3699,13 +3699,13 @@
36993699
 ** the clone in DIR rather than in "."
37003700
 ** --setmtime Set timestamps of all files to match their SCM-side
37013701
 ** times (the timestamp of the last checkin which modified
37023702
 ** them).
37033703
 ** --sync Auto-sync prior to opening even if the autosync setting
3704
-** is off.
3704
+** is off
37053705
 ** --verbose If passed a URI then this flag is passed on to the clone
3706
-** operation, otherwise it has no effect.
3706
+** operation, otherwise it has no effect
37073707
 ** --workdir DIR Use DIR as the working directory instead of ".". The DIR
37083708
 ** directory is created if it does not exist.
37093709
 **
37103710
 ** See also: [[close]], [[clone]]
37113711
 */
@@ -4624,14 +4624,14 @@
46244624
 ** configuration database. If both a local and a global value exists for a
46254625
 ** setting, the local value takes precedence. This command normally operates
46264626
 ** on the local settings. Use the --global option to change global settings.
46274627
 **
46284628
 ** Options:
4629
-** --global set or unset the given property globally instead of
4630
-** setting or unsetting it for the open repository only.
4629
+** --global Set or unset the given property globally instead of
4630
+** setting or unsetting it for the open repository only
46314631
 **
4632
-** --exact only consider exact name matches.
4632
+** --exact Only consider exact name matches
46334633
 **
46344634
 ** See also: [[configuration]]
46354635
 */
46364636
 void setting_cmd(void){
46374637
 int i;
46384638
--- src/db.c
+++ src/db.c
@@ -3687,11 +3687,11 @@
3687 ** Options:
3688 ** --empty Initialize checkout as being empty, but still connected
3689 ** with the local repository. If you commit this checkout,
3690 ** it will become a new "initial" commit in the repository.
3691 ** -f|--force Continue with the open even if the working directory is
3692 ** not empty.
3693 ** --force-missing Force opening a repository with missing content
3694 ** -k|--keep Only modify the manifest file(s)
3695 ** --nested Allow opening a repository inside an opened checkout
3696 ** --nosync Do not auto-sync the repository prior to opening even
3697 ** if the autosync setting is on.
@@ -3699,13 +3699,13 @@
3699 ** the clone in DIR rather than in "."
3700 ** --setmtime Set timestamps of all files to match their SCM-side
3701 ** times (the timestamp of the last checkin which modified
3702 ** them).
3703 ** --sync Auto-sync prior to opening even if the autosync setting
3704 ** is off.
3705 ** --verbose If passed a URI then this flag is passed on to the clone
3706 ** operation, otherwise it has no effect.
3707 ** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3708 ** directory is created if it does not exist.
3709 **
3710 ** See also: [[close]], [[clone]]
3711 */
@@ -4624,14 +4624,14 @@
4624 ** configuration database. If both a local and a global value exists for a
4625 ** setting, the local value takes precedence. This command normally operates
4626 ** on the local settings. Use the --global option to change global settings.
4627 **
4628 ** Options:
4629 ** --global set or unset the given property globally instead of
4630 ** setting or unsetting it for the open repository only.
4631 **
4632 ** --exact only consider exact name matches.
4633 **
4634 ** See also: [[configuration]]
4635 */
4636 void setting_cmd(void){
4637 int i;
4638
--- src/db.c
+++ src/db.c
@@ -3687,11 +3687,11 @@
3687 ** Options:
3688 ** --empty Initialize checkout as being empty, but still connected
3689 ** with the local repository. If you commit this checkout,
3690 ** it will become a new "initial" commit in the repository.
3691 ** -f|--force Continue with the open even if the working directory is
3692 ** not empty
3693 ** --force-missing Force opening a repository with missing content
3694 ** -k|--keep Only modify the manifest file(s)
3695 ** --nested Allow opening a repository inside an opened checkout
3696 ** --nosync Do not auto-sync the repository prior to opening even
3697 ** if the autosync setting is on.
@@ -3699,13 +3699,13 @@
3699 ** the clone in DIR rather than in "."
3700 ** --setmtime Set timestamps of all files to match their SCM-side
3701 ** times (the timestamp of the last checkin which modified
3702 ** them).
3703 ** --sync Auto-sync prior to opening even if the autosync setting
3704 ** is off
3705 ** --verbose If passed a URI then this flag is passed on to the clone
3706 ** operation, otherwise it has no effect
3707 ** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3708 ** directory is created if it does not exist.
3709 **
3710 ** See also: [[close]], [[clone]]
3711 */
@@ -4624,14 +4624,14 @@
4624 ** configuration database. If both a local and a global value exists for a
4625 ** setting, the local value takes precedence. This command normally operates
4626 ** on the local settings. Use the --global option to change global settings.
4627 **
4628 ** Options:
4629 ** --global Set or unset the given property globally instead of
4630 ** setting or unsetting it for the open repository only
4631 **
4632 ** --exact Only consider exact name matches
4633 **
4634 ** See also: [[configuration]]
4635 */
4636 void setting_cmd(void){
4637 int i;
4638
M src/export.c
+3 -3
--- src/export.c
+++ src/export.c
@@ -1841,21 +1841,21 @@
18411841
 ** --autopush URL Automatically do a 'git push' to URL. The
18421842
 ** URL is remembered and used on subsequent exports
18431843
 ** to the same repository. Or if URL is "off" the
18441844
 ** auto-push mechanism is disabled
18451845
 ** --debug FILE Write fast-export text to FILE rather than
1846
-** piping it into "git fast-import".
1846
+** piping it into "git fast-import"
18471847
 ** -f|--force Do the export even if nothing has changed
1848
-** --if-mirrored No-op if the mirror does not already exist.
1848
+** --if-mirrored No-op if the mirror does not already exist
18491849
 ** --limit N Add no more than N new check-ins to MIRROR.
18501850
 ** Useful for debugging
18511851
 ** --mainbranch NAME Use NAME as the name of the main branch in Git.
18521852
 ** The "trunk" branch of the Fossil repository is
18531853
 ** mapped into this name. "master" is used if
18541854
 ** this option is omitted.
18551855
 ** -q|--quiet Reduce output. Repeat for even less output.
1856
-** -v|--verbose More output.
1856
+** -v|--verbose More output
18571857
 **
18581858
 ** > fossil git import MIRROR
18591859
 **
18601860
 ** TBD...
18611861
 **
18621862
--- src/export.c
+++ src/export.c
@@ -1841,21 +1841,21 @@
1841 ** --autopush URL Automatically do a 'git push' to URL. The
1842 ** URL is remembered and used on subsequent exports
1843 ** to the same repository. Or if URL is "off" the
1844 ** auto-push mechanism is disabled
1845 ** --debug FILE Write fast-export text to FILE rather than
1846 ** piping it into "git fast-import".
1847 ** -f|--force Do the export even if nothing has changed
1848 ** --if-mirrored No-op if the mirror does not already exist.
1849 ** --limit N Add no more than N new check-ins to MIRROR.
1850 ** Useful for debugging
1851 ** --mainbranch NAME Use NAME as the name of the main branch in Git.
1852 ** The "trunk" branch of the Fossil repository is
1853 ** mapped into this name. "master" is used if
1854 ** this option is omitted.
1855 ** -q|--quiet Reduce output. Repeat for even less output.
1856 ** -v|--verbose More output.
1857 **
1858 ** > fossil git import MIRROR
1859 **
1860 ** TBD...
1861 **
1862
--- src/export.c
+++ src/export.c
@@ -1841,21 +1841,21 @@
1841 ** --autopush URL Automatically do a 'git push' to URL. The
1842 ** URL is remembered and used on subsequent exports
1843 ** to the same repository. Or if URL is "off" the
1844 ** auto-push mechanism is disabled
1845 ** --debug FILE Write fast-export text to FILE rather than
1846 ** piping it into "git fast-import"
1847 ** -f|--force Do the export even if nothing has changed
1848 ** --if-mirrored No-op if the mirror does not already exist
1849 ** --limit N Add no more than N new check-ins to MIRROR.
1850 ** Useful for debugging
1851 ** --mainbranch NAME Use NAME as the name of the main branch in Git.
1852 ** The "trunk" branch of the Fossil repository is
1853 ** mapped into this name. "master" is used if
1854 ** this option is omitted.
1855 ** -q|--quiet Reduce output. Repeat for even less output.
1856 ** -v|--verbose More output
1857 **
1858 ** > fossil git import MIRROR
1859 **
1860 ** TBD...
1861 **
1862
M src/export.c
+3 -3
--- src/export.c
+++ src/export.c
@@ -1841,21 +1841,21 @@
18411841
 ** --autopush URL Automatically do a 'git push' to URL. The
18421842
 ** URL is remembered and used on subsequent exports
18431843
 ** to the same repository. Or if URL is "off" the
18441844
 ** auto-push mechanism is disabled
18451845
 ** --debug FILE Write fast-export text to FILE rather than
1846
-** piping it into "git fast-import".
1846
+** piping it into "git fast-import"
18471847
 ** -f|--force Do the export even if nothing has changed
1848
-** --if-mirrored No-op if the mirror does not already exist.
1848
+** --if-mirrored No-op if the mirror does not already exist
18491849
 ** --limit N Add no more than N new check-ins to MIRROR.
18501850
 ** Useful for debugging
18511851
 ** --mainbranch NAME Use NAME as the name of the main branch in Git.
18521852
 ** The "trunk" branch of the Fossil repository is
18531853
 ** mapped into this name. "master" is used if
18541854
 ** this option is omitted.
18551855
 ** -q|--quiet Reduce output. Repeat for even less output.
1856
-** -v|--verbose More output.
1856
+** -v|--verbose More output
18571857
 **
18581858
 ** > fossil git import MIRROR
18591859
 **
18601860
 ** TBD...
18611861
 **
18621862
--- src/export.c
+++ src/export.c
@@ -1841,21 +1841,21 @@
1841 ** --autopush URL Automatically do a 'git push' to URL. The
1842 ** URL is remembered and used on subsequent exports
1843 ** to the same repository. Or if URL is "off" the
1844 ** auto-push mechanism is disabled
1845 ** --debug FILE Write fast-export text to FILE rather than
1846 ** piping it into "git fast-import".
1847 ** -f|--force Do the export even if nothing has changed
1848 ** --if-mirrored No-op if the mirror does not already exist.
1849 ** --limit N Add no more than N new check-ins to MIRROR.
1850 ** Useful for debugging
1851 ** --mainbranch NAME Use NAME as the name of the main branch in Git.
1852 ** The "trunk" branch of the Fossil repository is
1853 ** mapped into this name. "master" is used if
1854 ** this option is omitted.
1855 ** -q|--quiet Reduce output. Repeat for even less output.
1856 ** -v|--verbose More output.
1857 **
1858 ** > fossil git import MIRROR
1859 **
1860 ** TBD...
1861 **
1862
--- src/export.c
+++ src/export.c
@@ -1841,21 +1841,21 @@
1841 ** --autopush URL Automatically do a 'git push' to URL. The
1842 ** URL is remembered and used on subsequent exports
1843 ** to the same repository. Or if URL is "off" the
1844 ** auto-push mechanism is disabled
1845 ** --debug FILE Write fast-export text to FILE rather than
1846 ** piping it into "git fast-import"
1847 ** -f|--force Do the export even if nothing has changed
1848 ** --if-mirrored No-op if the mirror does not already exist
1849 ** --limit N Add no more than N new check-ins to MIRROR.
1850 ** Useful for debugging
1851 ** --mainbranch NAME Use NAME as the name of the main branch in Git.
1852 ** The "trunk" branch of the Fossil repository is
1853 ** mapped into this name. "master" is used if
1854 ** this option is omitted.
1855 ** -q|--quiet Reduce output. Repeat for even less output.
1856 ** -v|--verbose More output
1857 **
1858 ** > fossil git import MIRROR
1859 **
1860 ** TBD...
1861 **
1862
M src/file.c
+7 -7
--- src/file.c
+++ src/file.c
@@ -2446,22 +2446,22 @@
24462446
 **
24472447
 ** Options:
24482448
 ** --now Stamp each affected file with the current time.
24492449
 ** This is the default behavior.
24502450
 ** -c|--checkin Stamp each affected file with the time of the
2451
-** most recent check-in which modified that file.
2451
+** most recent check-in which modified that file
24522452
 ** -C|--checkout Stamp each affected file with the time of the
2453
-** currently-checked-out version.
2454
-** -g GLOBLIST Comma-separated list of glob patterns.
2453
+** currently checked-out version
2454
+** -g GLOBLIST Comma-separated list of glob patterns
24552455
 ** -G GLOBFILE Similar to -g but reads its globs from a
2456
-** fossil-conventional glob list file.
2456
+** fossil-conventional glob list file
24572457
 ** -v|--verbose Outputs extra information about its globs
2458
-** and each file it touches.
2458
+** and each file it touches
24592459
 ** -n|--dry-run Outputs which files would require touching,
2460
-** but does not touch them.
2460
+** but does not touch them
24612461
 ** -q|--quiet Suppress warnings, e.g. when skipping unmanaged
2462
-** or out-of-tree files.
2462
+** or out-of-tree files
24632463
 **
24642464
 ** Only one of --now, --checkin, and --checkout may be used. The
24652465
 ** default is --now.
24662466
 **
24672467
 ** Only one of -g or -G may be used. If neither is provided and no
24682468
--- src/file.c
+++ src/file.c
@@ -2446,22 +2446,22 @@
2446 **
2447 ** Options:
2448 ** --now Stamp each affected file with the current time.
2449 ** This is the default behavior.
2450 ** -c|--checkin Stamp each affected file with the time of the
2451 ** most recent check-in which modified that file.
2452 ** -C|--checkout Stamp each affected file with the time of the
2453 ** currently-checked-out version.
2454 ** -g GLOBLIST Comma-separated list of glob patterns.
2455 ** -G GLOBFILE Similar to -g but reads its globs from a
2456 ** fossil-conventional glob list file.
2457 ** -v|--verbose Outputs extra information about its globs
2458 ** and each file it touches.
2459 ** -n|--dry-run Outputs which files would require touching,
2460 ** but does not touch them.
2461 ** -q|--quiet Suppress warnings, e.g. when skipping unmanaged
2462 ** or out-of-tree files.
2463 **
2464 ** Only one of --now, --checkin, and --checkout may be used. The
2465 ** default is --now.
2466 **
2467 ** Only one of -g or -G may be used. If neither is provided and no
2468
--- src/file.c
+++ src/file.c
@@ -2446,22 +2446,22 @@
2446 **
2447 ** Options:
2448 ** --now Stamp each affected file with the current time.
2449 ** This is the default behavior.
2450 ** -c|--checkin Stamp each affected file with the time of the
2451 ** most recent check-in which modified that file
2452 ** -C|--checkout Stamp each affected file with the time of the
2453 ** currently checked-out version
2454 ** -g GLOBLIST Comma-separated list of glob patterns
2455 ** -G GLOBFILE Similar to -g but reads its globs from a
2456 ** fossil-conventional glob list file
2457 ** -v|--verbose Outputs extra information about its globs
2458 ** and each file it touches
2459 ** -n|--dry-run Outputs which files would require touching,
2460 ** but does not touch them
2461 ** -q|--quiet Suppress warnings, e.g. when skipping unmanaged
2462 ** or out-of-tree files
2463 **
2464 ** Only one of --now, --checkin, and --checkout may be used. The
2465 ** default is --now.
2466 **
2467 ** Only one of -g or -G may be used. If neither is provided and no
2468
M src/file.c
+7 -7
--- src/file.c
+++ src/file.c
@@ -2446,22 +2446,22 @@
24462446
 **
24472447
 ** Options:
24482448
 ** --now Stamp each affected file with the current time.
24492449
 ** This is the default behavior.
24502450
 ** -c|--checkin Stamp each affected file with the time of the
2451
-** most recent check-in which modified that file.
2451
+** most recent check-in which modified that file
24522452
 ** -C|--checkout Stamp each affected file with the time of the
2453
-** currently-checked-out version.
2454
-** -g GLOBLIST Comma-separated list of glob patterns.
2453
+** currently checked-out version
2454
+** -g GLOBLIST Comma-separated list of glob patterns
24552455
 ** -G GLOBFILE Similar to -g but reads its globs from a
2456
-** fossil-conventional glob list file.
2456
+** fossil-conventional glob list file
24572457
 ** -v|--verbose Outputs extra information about its globs
2458
-** and each file it touches.
2458
+** and each file it touches
24592459
 ** -n|--dry-run Outputs which files would require touching,
2460
-** but does not touch them.
2460
+** but does not touch them
24612461
 ** -q|--quiet Suppress warnings, e.g. when skipping unmanaged
2462
-** or out-of-tree files.
2462
+** or out-of-tree files
24632463
 **
24642464
 ** Only one of --now, --checkin, and --checkout may be used. The
24652465
 ** default is --now.
24662466
 **
24672467
 ** Only one of -g or -G may be used. If neither is provided and no
24682468
--- src/file.c
+++ src/file.c
@@ -2446,22 +2446,22 @@
2446 **
2447 ** Options:
2448 ** --now Stamp each affected file with the current time.
2449 ** This is the default behavior.
2450 ** -c|--checkin Stamp each affected file with the time of the
2451 ** most recent check-in which modified that file.
2452 ** -C|--checkout Stamp each affected file with the time of the
2453 ** currently-checked-out version.
2454 ** -g GLOBLIST Comma-separated list of glob patterns.
2455 ** -G GLOBFILE Similar to -g but reads its globs from a
2456 ** fossil-conventional glob list file.
2457 ** -v|--verbose Outputs extra information about its globs
2458 ** and each file it touches.
2459 ** -n|--dry-run Outputs which files would require touching,
2460 ** but does not touch them.
2461 ** -q|--quiet Suppress warnings, e.g. when skipping unmanaged
2462 ** or out-of-tree files.
2463 **
2464 ** Only one of --now, --checkin, and --checkout may be used. The
2465 ** default is --now.
2466 **
2467 ** Only one of -g or -G may be used. If neither is provided and no
2468
--- src/file.c
+++ src/file.c
@@ -2446,22 +2446,22 @@
2446 **
2447 ** Options:
2448 ** --now Stamp each affected file with the current time.
2449 ** This is the default behavior.
2450 ** -c|--checkin Stamp each affected file with the time of the
2451 ** most recent check-in which modified that file
2452 ** -C|--checkout Stamp each affected file with the time of the
2453 ** currently checked-out version
2454 ** -g GLOBLIST Comma-separated list of glob patterns
2455 ** -G GLOBFILE Similar to -g but reads its globs from a
2456 ** fossil-conventional glob list file
2457 ** -v|--verbose Outputs extra information about its globs
2458 ** and each file it touches
2459 ** -n|--dry-run Outputs which files would require touching,
2460 ** but does not touch them
2461 ** -q|--quiet Suppress warnings, e.g. when skipping unmanaged
2462 ** or out-of-tree files
2463 **
2464 ** Only one of --now, --checkin, and --checkout may be used. The
2465 ** default is --now.
2466 **
2467 ** Only one of -g or -G may be used. If neither is provided and no
2468
M src/import.c
+9 -9
--- src/import.c
+++ src/import.c
@@ -1689,19 +1689,19 @@
16891689
 ** --no-rev-tags Disables tagging effect of -i
16901690
 ** --rename-rev PAT Rev tag names, default "svn-rev-%"
16911691
 ** --ignore-tree DIR Ignores subtree rooted at DIR
16921692
 **
16931693
 ** Common Options:
1694
-** -i|--incremental allow importing into an existing repository
1695
-** -f|--force overwrite repository if already exists
1696
-** -q|--quiet omit progress output
1697
-** --no-rebuild skip the "rebuilding metadata" step
1698
-** --no-vacuum skip the final VACUUM of the database file
1699
-** --rename-trunk NAME use NAME as name of imported trunk branch
1700
-** --rename-branch PAT rename all branch names using PAT pattern
1701
-** --rename-tag PAT rename all tag names using PAT pattern
1702
-** -A|--admin-user NAME use NAME for the admin user
1694
+** -i|--incremental Allow importing into an existing repository
1695
+** -f|--force Overwrite repository if already exists
1696
+** -q|--quiet Omit progress output
1697
+** --no-rebuild Skip the "rebuilding metadata" step
1698
+** --no-vacuum Skip the final VACUUM of the database file
1699
+** --rename-trunk NAME Use NAME as name of imported trunk branch
1700
+** --rename-branch PAT Rename all branch names using PAT pattern
1701
+** --rename-tag PAT Rename all tag names using PAT pattern
1702
+** -A|--admin-user NAME Use NAME for the admin user
17031703
 **
17041704
 ** The --incremental option allows an existing repository to be extended
17051705
 ** with new content. The --rename-* options may be useful to avoid name
17061706
 ** conflicts when using the --incremental option. The --admin-user
17071707
 ** option is ignored if --incremental is specified.
17081708
--- src/import.c
+++ src/import.c
@@ -1689,19 +1689,19 @@
1689 ** --no-rev-tags Disables tagging effect of -i
1690 ** --rename-rev PAT Rev tag names, default "svn-rev-%"
1691 ** --ignore-tree DIR Ignores subtree rooted at DIR
1692 **
1693 ** Common Options:
1694 ** -i|--incremental allow importing into an existing repository
1695 ** -f|--force overwrite repository if already exists
1696 ** -q|--quiet omit progress output
1697 ** --no-rebuild skip the "rebuilding metadata" step
1698 ** --no-vacuum skip the final VACUUM of the database file
1699 ** --rename-trunk NAME use NAME as name of imported trunk branch
1700 ** --rename-branch PAT rename all branch names using PAT pattern
1701 ** --rename-tag PAT rename all tag names using PAT pattern
1702 ** -A|--admin-user NAME use NAME for the admin user
1703 **
1704 ** The --incremental option allows an existing repository to be extended
1705 ** with new content. The --rename-* options may be useful to avoid name
1706 ** conflicts when using the --incremental option. The --admin-user
1707 ** option is ignored if --incremental is specified.
1708
--- src/import.c
+++ src/import.c
@@ -1689,19 +1689,19 @@
1689 ** --no-rev-tags Disables tagging effect of -i
1690 ** --rename-rev PAT Rev tag names, default "svn-rev-%"
1691 ** --ignore-tree DIR Ignores subtree rooted at DIR
1692 **
1693 ** Common Options:
1694 ** -i|--incremental Allow importing into an existing repository
1695 ** -f|--force Overwrite repository if already exists
1696 ** -q|--quiet Omit progress output
1697 ** --no-rebuild Skip the "rebuilding metadata" step
1698 ** --no-vacuum Skip the final VACUUM of the database file
1699 ** --rename-trunk NAME Use NAME as name of imported trunk branch
1700 ** --rename-branch PAT Rename all branch names using PAT pattern
1701 ** --rename-tag PAT Rename all tag names using PAT pattern
1702 ** -A|--admin-user NAME Use NAME for the admin user
1703 **
1704 ** The --incremental option allows an existing repository to be extended
1705 ** with new content. The --rename-* options may be useful to avoid name
1706 ** conflicts when using the --incremental option. The --admin-user
1707 ** option is ignored if --incremental is specified.
1708
M src/import.c
+9 -9
--- src/import.c
+++ src/import.c
@@ -1689,19 +1689,19 @@
16891689
 ** --no-rev-tags Disables tagging effect of -i
16901690
 ** --rename-rev PAT Rev tag names, default "svn-rev-%"
16911691
 ** --ignore-tree DIR Ignores subtree rooted at DIR
16921692
 **
16931693
 ** Common Options:
1694
-** -i|--incremental allow importing into an existing repository
1695
-** -f|--force overwrite repository if already exists
1696
-** -q|--quiet omit progress output
1697
-** --no-rebuild skip the "rebuilding metadata" step
1698
-** --no-vacuum skip the final VACUUM of the database file
1699
-** --rename-trunk NAME use NAME as name of imported trunk branch
1700
-** --rename-branch PAT rename all branch names using PAT pattern
1701
-** --rename-tag PAT rename all tag names using PAT pattern
1702
-** -A|--admin-user NAME use NAME for the admin user
1694
+** -i|--incremental Allow importing into an existing repository
1695
+** -f|--force Overwrite repository if already exists
1696
+** -q|--quiet Omit progress output
1697
+** --no-rebuild Skip the "rebuilding metadata" step
1698
+** --no-vacuum Skip the final VACUUM of the database file
1699
+** --rename-trunk NAME Use NAME as name of imported trunk branch
1700
+** --rename-branch PAT Rename all branch names using PAT pattern
1701
+** --rename-tag PAT Rename all tag names using PAT pattern
1702
+** -A|--admin-user NAME Use NAME for the admin user
17031703
 **
17041704
 ** The --incremental option allows an existing repository to be extended
17051705
 ** with new content. The --rename-* options may be useful to avoid name
17061706
 ** conflicts when using the --incremental option. The --admin-user
17071707
 ** option is ignored if --incremental is specified.
17081708
--- src/import.c
+++ src/import.c
@@ -1689,19 +1689,19 @@
1689 ** --no-rev-tags Disables tagging effect of -i
1690 ** --rename-rev PAT Rev tag names, default "svn-rev-%"
1691 ** --ignore-tree DIR Ignores subtree rooted at DIR
1692 **
1693 ** Common Options:
1694 ** -i|--incremental allow importing into an existing repository
1695 ** -f|--force overwrite repository if already exists
1696 ** -q|--quiet omit progress output
1697 ** --no-rebuild skip the "rebuilding metadata" step
1698 ** --no-vacuum skip the final VACUUM of the database file
1699 ** --rename-trunk NAME use NAME as name of imported trunk branch
1700 ** --rename-branch PAT rename all branch names using PAT pattern
1701 ** --rename-tag PAT rename all tag names using PAT pattern
1702 ** -A|--admin-user NAME use NAME for the admin user
1703 **
1704 ** The --incremental option allows an existing repository to be extended
1705 ** with new content. The --rename-* options may be useful to avoid name
1706 ** conflicts when using the --incremental option. The --admin-user
1707 ** option is ignored if --incremental is specified.
1708
--- src/import.c
+++ src/import.c
@@ -1689,19 +1689,19 @@
1689 ** --no-rev-tags Disables tagging effect of -i
1690 ** --rename-rev PAT Rev tag names, default "svn-rev-%"
1691 ** --ignore-tree DIR Ignores subtree rooted at DIR
1692 **
1693 ** Common Options:
1694 ** -i|--incremental Allow importing into an existing repository
1695 ** -f|--force Overwrite repository if already exists
1696 ** -q|--quiet Omit progress output
1697 ** --no-rebuild Skip the "rebuilding metadata" step
1698 ** --no-vacuum Skip the final VACUUM of the database file
1699 ** --rename-trunk NAME Use NAME as name of imported trunk branch
1700 ** --rename-branch PAT Rename all branch names using PAT pattern
1701 ** --rename-tag PAT Rename all tag names using PAT pattern
1702 ** -A|--admin-user NAME Use NAME for the admin user
1703 **
1704 ** The --incremental option allows an existing repository to be extended
1705 ** with new content. The --rename-* options may be useful to avoid name
1706 ** conflicts when using the --incremental option. The --admin-user
1707 ** option is ignored if --incremental is specified.
1708
M src/main.c
+16 -16
--- src/main.c
+++ src/main.c
@@ -2680,11 +2680,11 @@
26802680
 ** returned if they match comma-separate GLOB pattern specified by --files
26812681
 ** and do not match "*.fossil*" and have a well-known suffix.
26822682
 **
26832683
 ** Options:
26842684
 ** --acme Deliver files from the ".well-known" subdirectory
2685
-** --baseurl URL base URL (useful with reverse proxies)
2685
+** --baseurl URL Base URL (useful with reverse proxies)
26862686
 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
26872687
 ** fullchain.pem) taken from FILE.
26882688
 ** --chroot DIR Use directory for chroot instead of repository path.
26892689
 ** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
26902690
 ** /doc/ckout/...
@@ -2708,23 +2708,23 @@
27082708
 ** Depending on the needs of any given page, inline
27092709
 ** and bundled modes might result in a single
27102710
 ** amalgamated script or several, but both approaches
27112711
 ** result in fewer HTTP requests than the separate mode.
27122712
 ** --localauth Connections from localhost are given "setup"
2713
-** privileges without having to log in.
2713
+** privileges without having to log in
27142714
 ** --mainmenu FILE Override the mainmenu config setting with the contents
2715
-** of the given file.
2715
+** of the given file
27162716
 ** --nocompress Do not compress HTTP replies
27172717
 ** --nodelay Omit backoffice processing if it would delay
27182718
 ** process exit
27192719
 ** --nojail Drop root privilege but do not enter the chroot jail
27202720
 ** --nossl Do not do http: to https: redirects, regardless of
27212721
 ** the redirect-to-https setting.
2722
-** --notfound URL Use URL as the "HTTP 404, object not found" page.
2722
+** --notfound URL Use URL as the "HTTP 404, object not found" page
27232723
 ** --out FILE Write the HTTP reply to FILE instead of to
27242724
 ** standard output
2725
-** --pkey FILE Read the private key used for TLS from FILE.
2725
+** --pkey FILE Read the private key used for TLS from FILE
27262726
 ** --repolist If REPOSITORY is directory, URL "/" lists all repos
27272727
 ** --scgi Interpret input as SCGI rather than HTTP
27282728
 ** --skin LABEL Use override skin LABEL. Use an empty string ("")
27292729
 ** to force use of the current local skin config.
27302730
 ** --th-trace Trace TH1 execution (for debugging purposes)
@@ -3020,24 +3020,24 @@
30203020
 ** --localauth option is present and the "localauth" setting is off and the
30213021
 ** connection is from localhost. The "ui" command also enables --repolist
30223022
 ** by default.
30233023
 **
30243024
 ** Options:
3025
-** --acme Deliver files from the ".well-known" subdirectory.
3025
+** --acme Deliver files from the ".well-known" subdirectory
30263026
 ** --baseurl URL Use URL as the base (useful for reverse proxies)
30273027
 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
30283028
 ** fullchain.pem) taken from FILE.
3029
-** --chroot DIR Use directory for chroot instead of repository path.
3029
+** --chroot DIR Use directory for chroot instead of repository path
30303030
 ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were
30313031
 ** /doc/ckout/...
30323032
 ** --create Create a new REPOSITORY if it does not already exist
30333033
 ** --extroot DIR Document root for the /ext extension mechanism
30343034
 ** --files GLOBLIST Comma-separated list of glob patterns for static files
30353035
 ** --fossilcmd PATH Full pathname of the "fossil" executable on the remote
30363036
 ** system when REPOSITORY is remote. Default: "fossil"
3037
-** --localauth enable automatic login for requests from localhost
3038
-** --localhost listen on 127.0.0.1 only (always true for "ui")
3037
+** --localauth Enable automatic login for requests from localhost
3038
+** --localhost Listen on 127.0.0.1 only (always true for "ui")
30393039
 ** --https Indicates that the input is coming through a reverse
30403040
 ** proxy that has already translated HTTPS into HTTP.
30413041
 ** --jsmode MODE Determine how JavaScript is delivered with pages.
30423042
 ** Mode can be one of:
30433043
 ** inline All JavaScript is inserted inline at
@@ -3049,28 +3049,28 @@
30493049
 ** Depending on the needs of any given page, inline
30503050
 ** and bundled modes might result in a single
30513051
 ** amalgamated script or several, but both approaches
30523052
 ** result in fewer HTTP requests than the separate mode.
30533053
 ** --mainmenu FILE Override the mainmenu config setting with the contents
3054
-** of the given file.
3054
+** of the given file
30553055
 ** --max-latency N Do not let any single HTTP request run for more than N
30563056
 ** seconds (only works on unix)
30573057
 ** -B|--nobrowser Do not automatically launch a web-browser for the
3058
-** "fossil ui" command.
3058
+** "fossil ui" command
30593059
 ** --nocompress Do not compress HTTP replies
30603060
 ** --nojail Drop root privileges but do not enter the chroot jail
3061
-** --nossl do not force redirects to SSL even if the repository
3061
+** --nossl Do not force redirects to SSL even if the repository
30623062
 ** setting "redirect-to-https" requests it. This is set
30633063
 ** by default for the "ui" command.
30643064
 ** --notfound URL Redirect to URL if a page is not found.
30653065
 ** -p|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3066
-** --pkey FILE Read the private key used for TLS from FILE.
3067
-** -P|--port TCPPORT listen to request on port TCPPORT
3068
-** --repolist If REPOSITORY is dir, URL "/" lists repos.
3066
+** --pkey FILE Read the private key used for TLS from FILE
3067
+** -P|--port TCPPORT Listen to request on port TCPPORT
3068
+** --repolist If REPOSITORY is dir, URL "/" lists repos
30693069
 ** --scgi Accept SCGI rather than HTTP
30703070
 ** --skin LABEL Use override skin LABEL
3071
-** --th-trace trace TH1 execution (for debugging purposes)
3071
+** --th-trace Trace TH1 execution (for debugging purposes)
30723072
 ** --usepidkey Use saved encryption key from parent process. This is
30733073
 ** only necessary when using SEE on Windows.
30743074
 **
30753075
 ** See also: [[cgi]], [[http]], [[winsrv]]
30763076
 */
30773077
--- src/main.c
+++ src/main.c
@@ -2680,11 +2680,11 @@
2680 ** returned if they match comma-separate GLOB pattern specified by --files
2681 ** and do not match "*.fossil*" and have a well-known suffix.
2682 **
2683 ** Options:
2684 ** --acme Deliver files from the ".well-known" subdirectory
2685 ** --baseurl URL base URL (useful with reverse proxies)
2686 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
2687 ** fullchain.pem) taken from FILE.
2688 ** --chroot DIR Use directory for chroot instead of repository path.
2689 ** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2690 ** /doc/ckout/...
@@ -2708,23 +2708,23 @@
2708 ** Depending on the needs of any given page, inline
2709 ** and bundled modes might result in a single
2710 ** amalgamated script or several, but both approaches
2711 ** result in fewer HTTP requests than the separate mode.
2712 ** --localauth Connections from localhost are given "setup"
2713 ** privileges without having to log in.
2714 ** --mainmenu FILE Override the mainmenu config setting with the contents
2715 ** of the given file.
2716 ** --nocompress Do not compress HTTP replies
2717 ** --nodelay Omit backoffice processing if it would delay
2718 ** process exit
2719 ** --nojail Drop root privilege but do not enter the chroot jail
2720 ** --nossl Do not do http: to https: redirects, regardless of
2721 ** the redirect-to-https setting.
2722 ** --notfound URL Use URL as the "HTTP 404, object not found" page.
2723 ** --out FILE Write the HTTP reply to FILE instead of to
2724 ** standard output
2725 ** --pkey FILE Read the private key used for TLS from FILE.
2726 ** --repolist If REPOSITORY is directory, URL "/" lists all repos
2727 ** --scgi Interpret input as SCGI rather than HTTP
2728 ** --skin LABEL Use override skin LABEL. Use an empty string ("")
2729 ** to force use of the current local skin config.
2730 ** --th-trace Trace TH1 execution (for debugging purposes)
@@ -3020,24 +3020,24 @@
3020 ** --localauth option is present and the "localauth" setting is off and the
3021 ** connection is from localhost. The "ui" command also enables --repolist
3022 ** by default.
3023 **
3024 ** Options:
3025 ** --acme Deliver files from the ".well-known" subdirectory.
3026 ** --baseurl URL Use URL as the base (useful for reverse proxies)
3027 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
3028 ** fullchain.pem) taken from FILE.
3029 ** --chroot DIR Use directory for chroot instead of repository path.
3030 ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were
3031 ** /doc/ckout/...
3032 ** --create Create a new REPOSITORY if it does not already exist
3033 ** --extroot DIR Document root for the /ext extension mechanism
3034 ** --files GLOBLIST Comma-separated list of glob patterns for static files
3035 ** --fossilcmd PATH Full pathname of the "fossil" executable on the remote
3036 ** system when REPOSITORY is remote. Default: "fossil"
3037 ** --localauth enable automatic login for requests from localhost
3038 ** --localhost listen on 127.0.0.1 only (always true for "ui")
3039 ** --https Indicates that the input is coming through a reverse
3040 ** proxy that has already translated HTTPS into HTTP.
3041 ** --jsmode MODE Determine how JavaScript is delivered with pages.
3042 ** Mode can be one of:
3043 ** inline All JavaScript is inserted inline at
@@ -3049,28 +3049,28 @@
3049 ** Depending on the needs of any given page, inline
3050 ** and bundled modes might result in a single
3051 ** amalgamated script or several, but both approaches
3052 ** result in fewer HTTP requests than the separate mode.
3053 ** --mainmenu FILE Override the mainmenu config setting with the contents
3054 ** of the given file.
3055 ** --max-latency N Do not let any single HTTP request run for more than N
3056 ** seconds (only works on unix)
3057 ** -B|--nobrowser Do not automatically launch a web-browser for the
3058 ** "fossil ui" command.
3059 ** --nocompress Do not compress HTTP replies
3060 ** --nojail Drop root privileges but do not enter the chroot jail
3061 ** --nossl do not force redirects to SSL even if the repository
3062 ** setting "redirect-to-https" requests it. This is set
3063 ** by default for the "ui" command.
3064 ** --notfound URL Redirect to URL if a page is not found.
3065 ** -p|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3066 ** --pkey FILE Read the private key used for TLS from FILE.
3067 ** -P|--port TCPPORT listen to request on port TCPPORT
3068 ** --repolist If REPOSITORY is dir, URL "/" lists repos.
3069 ** --scgi Accept SCGI rather than HTTP
3070 ** --skin LABEL Use override skin LABEL
3071 ** --th-trace trace TH1 execution (for debugging purposes)
3072 ** --usepidkey Use saved encryption key from parent process. This is
3073 ** only necessary when using SEE on Windows.
3074 **
3075 ** See also: [[cgi]], [[http]], [[winsrv]]
3076 */
3077
--- src/main.c
+++ src/main.c
@@ -2680,11 +2680,11 @@
2680 ** returned if they match comma-separate GLOB pattern specified by --files
2681 ** and do not match "*.fossil*" and have a well-known suffix.
2682 **
2683 ** Options:
2684 ** --acme Deliver files from the ".well-known" subdirectory
2685 ** --baseurl URL Base URL (useful with reverse proxies)
2686 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
2687 ** fullchain.pem) taken from FILE.
2688 ** --chroot DIR Use directory for chroot instead of repository path.
2689 ** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2690 ** /doc/ckout/...
@@ -2708,23 +2708,23 @@
2708 ** Depending on the needs of any given page, inline
2709 ** and bundled modes might result in a single
2710 ** amalgamated script or several, but both approaches
2711 ** result in fewer HTTP requests than the separate mode.
2712 ** --localauth Connections from localhost are given "setup"
2713 ** privileges without having to log in
2714 ** --mainmenu FILE Override the mainmenu config setting with the contents
2715 ** of the given file
2716 ** --nocompress Do not compress HTTP replies
2717 ** --nodelay Omit backoffice processing if it would delay
2718 ** process exit
2719 ** --nojail Drop root privilege but do not enter the chroot jail
2720 ** --nossl Do not do http: to https: redirects, regardless of
2721 ** the redirect-to-https setting.
2722 ** --notfound URL Use URL as the "HTTP 404, object not found" page
2723 ** --out FILE Write the HTTP reply to FILE instead of to
2724 ** standard output
2725 ** --pkey FILE Read the private key used for TLS from FILE
2726 ** --repolist If REPOSITORY is directory, URL "/" lists all repos
2727 ** --scgi Interpret input as SCGI rather than HTTP
2728 ** --skin LABEL Use override skin LABEL. Use an empty string ("")
2729 ** to force use of the current local skin config.
2730 ** --th-trace Trace TH1 execution (for debugging purposes)
@@ -3020,24 +3020,24 @@
3020 ** --localauth option is present and the "localauth" setting is off and the
3021 ** connection is from localhost. The "ui" command also enables --repolist
3022 ** by default.
3023 **
3024 ** Options:
3025 ** --acme Deliver files from the ".well-known" subdirectory
3026 ** --baseurl URL Use URL as the base (useful for reverse proxies)
3027 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
3028 ** fullchain.pem) taken from FILE.
3029 ** --chroot DIR Use directory for chroot instead of repository path
3030 ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were
3031 ** /doc/ckout/...
3032 ** --create Create a new REPOSITORY if it does not already exist
3033 ** --extroot DIR Document root for the /ext extension mechanism
3034 ** --files GLOBLIST Comma-separated list of glob patterns for static files
3035 ** --fossilcmd PATH Full pathname of the "fossil" executable on the remote
3036 ** system when REPOSITORY is remote. Default: "fossil"
3037 ** --localauth Enable automatic login for requests from localhost
3038 ** --localhost Listen on 127.0.0.1 only (always true for "ui")
3039 ** --https Indicates that the input is coming through a reverse
3040 ** proxy that has already translated HTTPS into HTTP.
3041 ** --jsmode MODE Determine how JavaScript is delivered with pages.
3042 ** Mode can be one of:
3043 ** inline All JavaScript is inserted inline at
@@ -3049,28 +3049,28 @@
3049 ** Depending on the needs of any given page, inline
3050 ** and bundled modes might result in a single
3051 ** amalgamated script or several, but both approaches
3052 ** result in fewer HTTP requests than the separate mode.
3053 ** --mainmenu FILE Override the mainmenu config setting with the contents
3054 ** of the given file
3055 ** --max-latency N Do not let any single HTTP request run for more than N
3056 ** seconds (only works on unix)
3057 ** -B|--nobrowser Do not automatically launch a web-browser for the
3058 ** "fossil ui" command
3059 ** --nocompress Do not compress HTTP replies
3060 ** --nojail Drop root privileges but do not enter the chroot jail
3061 ** --nossl Do not force redirects to SSL even if the repository
3062 ** setting "redirect-to-https" requests it. This is set
3063 ** by default for the "ui" command.
3064 ** --notfound URL Redirect to URL if a page is not found.
3065 ** -p|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3066 ** --pkey FILE Read the private key used for TLS from FILE
3067 ** -P|--port TCPPORT Listen to request on port TCPPORT
3068 ** --repolist If REPOSITORY is dir, URL "/" lists repos
3069 ** --scgi Accept SCGI rather than HTTP
3070 ** --skin LABEL Use override skin LABEL
3071 ** --th-trace Trace TH1 execution (for debugging purposes)
3072 ** --usepidkey Use saved encryption key from parent process. This is
3073 ** only necessary when using SEE on Windows.
3074 **
3075 ** See also: [[cgi]], [[http]], [[winsrv]]
3076 */
3077
M src/main.c
+16 -16
--- src/main.c
+++ src/main.c
@@ -2680,11 +2680,11 @@
26802680
 ** returned if they match comma-separate GLOB pattern specified by --files
26812681
 ** and do not match "*.fossil*" and have a well-known suffix.
26822682
 **
26832683
 ** Options:
26842684
 ** --acme Deliver files from the ".well-known" subdirectory
2685
-** --baseurl URL base URL (useful with reverse proxies)
2685
+** --baseurl URL Base URL (useful with reverse proxies)
26862686
 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
26872687
 ** fullchain.pem) taken from FILE.
26882688
 ** --chroot DIR Use directory for chroot instead of repository path.
26892689
 ** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
26902690
 ** /doc/ckout/...
@@ -2708,23 +2708,23 @@
27082708
 ** Depending on the needs of any given page, inline
27092709
 ** and bundled modes might result in a single
27102710
 ** amalgamated script or several, but both approaches
27112711
 ** result in fewer HTTP requests than the separate mode.
27122712
 ** --localauth Connections from localhost are given "setup"
2713
-** privileges without having to log in.
2713
+** privileges without having to log in
27142714
 ** --mainmenu FILE Override the mainmenu config setting with the contents
2715
-** of the given file.
2715
+** of the given file
27162716
 ** --nocompress Do not compress HTTP replies
27172717
 ** --nodelay Omit backoffice processing if it would delay
27182718
 ** process exit
27192719
 ** --nojail Drop root privilege but do not enter the chroot jail
27202720
 ** --nossl Do not do http: to https: redirects, regardless of
27212721
 ** the redirect-to-https setting.
2722
-** --notfound URL Use URL as the "HTTP 404, object not found" page.
2722
+** --notfound URL Use URL as the "HTTP 404, object not found" page
27232723
 ** --out FILE Write the HTTP reply to FILE instead of to
27242724
 ** standard output
2725
-** --pkey FILE Read the private key used for TLS from FILE.
2725
+** --pkey FILE Read the private key used for TLS from FILE
27262726
 ** --repolist If REPOSITORY is directory, URL "/" lists all repos
27272727
 ** --scgi Interpret input as SCGI rather than HTTP
27282728
 ** --skin LABEL Use override skin LABEL. Use an empty string ("")
27292729
 ** to force use of the current local skin config.
27302730
 ** --th-trace Trace TH1 execution (for debugging purposes)
@@ -3020,24 +3020,24 @@
30203020
 ** --localauth option is present and the "localauth" setting is off and the
30213021
 ** connection is from localhost. The "ui" command also enables --repolist
30223022
 ** by default.
30233023
 **
30243024
 ** Options:
3025
-** --acme Deliver files from the ".well-known" subdirectory.
3025
+** --acme Deliver files from the ".well-known" subdirectory
30263026
 ** --baseurl URL Use URL as the base (useful for reverse proxies)
30273027
 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
30283028
 ** fullchain.pem) taken from FILE.
3029
-** --chroot DIR Use directory for chroot instead of repository path.
3029
+** --chroot DIR Use directory for chroot instead of repository path
30303030
 ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were
30313031
 ** /doc/ckout/...
30323032
 ** --create Create a new REPOSITORY if it does not already exist
30333033
 ** --extroot DIR Document root for the /ext extension mechanism
30343034
 ** --files GLOBLIST Comma-separated list of glob patterns for static files
30353035
 ** --fossilcmd PATH Full pathname of the "fossil" executable on the remote
30363036
 ** system when REPOSITORY is remote. Default: "fossil"
3037
-** --localauth enable automatic login for requests from localhost
3038
-** --localhost listen on 127.0.0.1 only (always true for "ui")
3037
+** --localauth Enable automatic login for requests from localhost
3038
+** --localhost Listen on 127.0.0.1 only (always true for "ui")
30393039
 ** --https Indicates that the input is coming through a reverse
30403040
 ** proxy that has already translated HTTPS into HTTP.
30413041
 ** --jsmode MODE Determine how JavaScript is delivered with pages.
30423042
 ** Mode can be one of:
30433043
 ** inline All JavaScript is inserted inline at
@@ -3049,28 +3049,28 @@
30493049
 ** Depending on the needs of any given page, inline
30503050
 ** and bundled modes might result in a single
30513051
 ** amalgamated script or several, but both approaches
30523052
 ** result in fewer HTTP requests than the separate mode.
30533053
 ** --mainmenu FILE Override the mainmenu config setting with the contents
3054
-** of the given file.
3054
+** of the given file
30553055
 ** --max-latency N Do not let any single HTTP request run for more than N
30563056
 ** seconds (only works on unix)
30573057
 ** -B|--nobrowser Do not automatically launch a web-browser for the
3058
-** "fossil ui" command.
3058
+** "fossil ui" command
30593059
 ** --nocompress Do not compress HTTP replies
30603060
 ** --nojail Drop root privileges but do not enter the chroot jail
3061
-** --nossl do not force redirects to SSL even if the repository
3061
+** --nossl Do not force redirects to SSL even if the repository
30623062
 ** setting "redirect-to-https" requests it. This is set
30633063
 ** by default for the "ui" command.
30643064
 ** --notfound URL Redirect to URL if a page is not found.
30653065
 ** -p|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3066
-** --pkey FILE Read the private key used for TLS from FILE.
3067
-** -P|--port TCPPORT listen to request on port TCPPORT
3068
-** --repolist If REPOSITORY is dir, URL "/" lists repos.
3066
+** --pkey FILE Read the private key used for TLS from FILE
3067
+** -P|--port TCPPORT Listen to request on port TCPPORT
3068
+** --repolist If REPOSITORY is dir, URL "/" lists repos
30693069
 ** --scgi Accept SCGI rather than HTTP
30703070
 ** --skin LABEL Use override skin LABEL
3071
-** --th-trace trace TH1 execution (for debugging purposes)
3071
+** --th-trace Trace TH1 execution (for debugging purposes)
30723072
 ** --usepidkey Use saved encryption key from parent process. This is
30733073
 ** only necessary when using SEE on Windows.
30743074
 **
30753075
 ** See also: [[cgi]], [[http]], [[winsrv]]
30763076
 */
30773077
--- src/main.c
+++ src/main.c
@@ -2680,11 +2680,11 @@
2680 ** returned if they match comma-separate GLOB pattern specified by --files
2681 ** and do not match "*.fossil*" and have a well-known suffix.
2682 **
2683 ** Options:
2684 ** --acme Deliver files from the ".well-known" subdirectory
2685 ** --baseurl URL base URL (useful with reverse proxies)
2686 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
2687 ** fullchain.pem) taken from FILE.
2688 ** --chroot DIR Use directory for chroot instead of repository path.
2689 ** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2690 ** /doc/ckout/...
@@ -2708,23 +2708,23 @@
2708 ** Depending on the needs of any given page, inline
2709 ** and bundled modes might result in a single
2710 ** amalgamated script or several, but both approaches
2711 ** result in fewer HTTP requests than the separate mode.
2712 ** --localauth Connections from localhost are given "setup"
2713 ** privileges without having to log in.
2714 ** --mainmenu FILE Override the mainmenu config setting with the contents
2715 ** of the given file.
2716 ** --nocompress Do not compress HTTP replies
2717 ** --nodelay Omit backoffice processing if it would delay
2718 ** process exit
2719 ** --nojail Drop root privilege but do not enter the chroot jail
2720 ** --nossl Do not do http: to https: redirects, regardless of
2721 ** the redirect-to-https setting.
2722 ** --notfound URL Use URL as the "HTTP 404, object not found" page.
2723 ** --out FILE Write the HTTP reply to FILE instead of to
2724 ** standard output
2725 ** --pkey FILE Read the private key used for TLS from FILE.
2726 ** --repolist If REPOSITORY is directory, URL "/" lists all repos
2727 ** --scgi Interpret input as SCGI rather than HTTP
2728 ** --skin LABEL Use override skin LABEL. Use an empty string ("")
2729 ** to force use of the current local skin config.
2730 ** --th-trace Trace TH1 execution (for debugging purposes)
@@ -3020,24 +3020,24 @@
3020 ** --localauth option is present and the "localauth" setting is off and the
3021 ** connection is from localhost. The "ui" command also enables --repolist
3022 ** by default.
3023 **
3024 ** Options:
3025 ** --acme Deliver files from the ".well-known" subdirectory.
3026 ** --baseurl URL Use URL as the base (useful for reverse proxies)
3027 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
3028 ** fullchain.pem) taken from FILE.
3029 ** --chroot DIR Use directory for chroot instead of repository path.
3030 ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were
3031 ** /doc/ckout/...
3032 ** --create Create a new REPOSITORY if it does not already exist
3033 ** --extroot DIR Document root for the /ext extension mechanism
3034 ** --files GLOBLIST Comma-separated list of glob patterns for static files
3035 ** --fossilcmd PATH Full pathname of the "fossil" executable on the remote
3036 ** system when REPOSITORY is remote. Default: "fossil"
3037 ** --localauth enable automatic login for requests from localhost
3038 ** --localhost listen on 127.0.0.1 only (always true for "ui")
3039 ** --https Indicates that the input is coming through a reverse
3040 ** proxy that has already translated HTTPS into HTTP.
3041 ** --jsmode MODE Determine how JavaScript is delivered with pages.
3042 ** Mode can be one of:
3043 ** inline All JavaScript is inserted inline at
@@ -3049,28 +3049,28 @@
3049 ** Depending on the needs of any given page, inline
3050 ** and bundled modes might result in a single
3051 ** amalgamated script or several, but both approaches
3052 ** result in fewer HTTP requests than the separate mode.
3053 ** --mainmenu FILE Override the mainmenu config setting with the contents
3054 ** of the given file.
3055 ** --max-latency N Do not let any single HTTP request run for more than N
3056 ** seconds (only works on unix)
3057 ** -B|--nobrowser Do not automatically launch a web-browser for the
3058 ** "fossil ui" command.
3059 ** --nocompress Do not compress HTTP replies
3060 ** --nojail Drop root privileges but do not enter the chroot jail
3061 ** --nossl do not force redirects to SSL even if the repository
3062 ** setting "redirect-to-https" requests it. This is set
3063 ** by default for the "ui" command.
3064 ** --notfound URL Redirect to URL if a page is not found.
3065 ** -p|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3066 ** --pkey FILE Read the private key used for TLS from FILE.
3067 ** -P|--port TCPPORT listen to request on port TCPPORT
3068 ** --repolist If REPOSITORY is dir, URL "/" lists repos.
3069 ** --scgi Accept SCGI rather than HTTP
3070 ** --skin LABEL Use override skin LABEL
3071 ** --th-trace trace TH1 execution (for debugging purposes)
3072 ** --usepidkey Use saved encryption key from parent process. This is
3073 ** only necessary when using SEE on Windows.
3074 **
3075 ** See also: [[cgi]], [[http]], [[winsrv]]
3076 */
3077
--- src/main.c
+++ src/main.c
@@ -2680,11 +2680,11 @@
2680 ** returned if they match comma-separate GLOB pattern specified by --files
2681 ** and do not match "*.fossil*" and have a well-known suffix.
2682 **
2683 ** Options:
2684 ** --acme Deliver files from the ".well-known" subdirectory
2685 ** --baseurl URL Base URL (useful with reverse proxies)
2686 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
2687 ** fullchain.pem) taken from FILE.
2688 ** --chroot DIR Use directory for chroot instead of repository path.
2689 ** --ckout-alias N Treat URIs of the form /doc/N/... as if they were
2690 ** /doc/ckout/...
@@ -2708,23 +2708,23 @@
2708 ** Depending on the needs of any given page, inline
2709 ** and bundled modes might result in a single
2710 ** amalgamated script or several, but both approaches
2711 ** result in fewer HTTP requests than the separate mode.
2712 ** --localauth Connections from localhost are given "setup"
2713 ** privileges without having to log in
2714 ** --mainmenu FILE Override the mainmenu config setting with the contents
2715 ** of the given file
2716 ** --nocompress Do not compress HTTP replies
2717 ** --nodelay Omit backoffice processing if it would delay
2718 ** process exit
2719 ** --nojail Drop root privilege but do not enter the chroot jail
2720 ** --nossl Do not do http: to https: redirects, regardless of
2721 ** the redirect-to-https setting.
2722 ** --notfound URL Use URL as the "HTTP 404, object not found" page
2723 ** --out FILE Write the HTTP reply to FILE instead of to
2724 ** standard output
2725 ** --pkey FILE Read the private key used for TLS from FILE
2726 ** --repolist If REPOSITORY is directory, URL "/" lists all repos
2727 ** --scgi Interpret input as SCGI rather than HTTP
2728 ** --skin LABEL Use override skin LABEL. Use an empty string ("")
2729 ** to force use of the current local skin config.
2730 ** --th-trace Trace TH1 execution (for debugging purposes)
@@ -3020,24 +3020,24 @@
3020 ** --localauth option is present and the "localauth" setting is off and the
3021 ** connection is from localhost. The "ui" command also enables --repolist
3022 ** by default.
3023 **
3024 ** Options:
3025 ** --acme Deliver files from the ".well-known" subdirectory
3026 ** --baseurl URL Use URL as the base (useful for reverse proxies)
3027 ** --cert FILE Use TLS (HTTPS) encryption with the certificate (the
3028 ** fullchain.pem) taken from FILE.
3029 ** --chroot DIR Use directory for chroot instead of repository path
3030 ** --ckout-alias NAME Treat URIs of the form /doc/NAME/... as if they were
3031 ** /doc/ckout/...
3032 ** --create Create a new REPOSITORY if it does not already exist
3033 ** --extroot DIR Document root for the /ext extension mechanism
3034 ** --files GLOBLIST Comma-separated list of glob patterns for static files
3035 ** --fossilcmd PATH Full pathname of the "fossil" executable on the remote
3036 ** system when REPOSITORY is remote. Default: "fossil"
3037 ** --localauth Enable automatic login for requests from localhost
3038 ** --localhost Listen on 127.0.0.1 only (always true for "ui")
3039 ** --https Indicates that the input is coming through a reverse
3040 ** proxy that has already translated HTTPS into HTTP.
3041 ** --jsmode MODE Determine how JavaScript is delivered with pages.
3042 ** Mode can be one of:
3043 ** inline All JavaScript is inserted inline at
@@ -3049,28 +3049,28 @@
3049 ** Depending on the needs of any given page, inline
3050 ** and bundled modes might result in a single
3051 ** amalgamated script or several, but both approaches
3052 ** result in fewer HTTP requests than the separate mode.
3053 ** --mainmenu FILE Override the mainmenu config setting with the contents
3054 ** of the given file
3055 ** --max-latency N Do not let any single HTTP request run for more than N
3056 ** seconds (only works on unix)
3057 ** -B|--nobrowser Do not automatically launch a web-browser for the
3058 ** "fossil ui" command
3059 ** --nocompress Do not compress HTTP replies
3060 ** --nojail Drop root privileges but do not enter the chroot jail
3061 ** --nossl Do not force redirects to SSL even if the repository
3062 ** setting "redirect-to-https" requests it. This is set
3063 ** by default for the "ui" command.
3064 ** --notfound URL Redirect to URL if a page is not found.
3065 ** -p|--page PAGE Start "ui" on PAGE. ex: --page "timeline?y=ci"
3066 ** --pkey FILE Read the private key used for TLS from FILE
3067 ** -P|--port TCPPORT Listen to request on port TCPPORT
3068 ** --repolist If REPOSITORY is dir, URL "/" lists repos
3069 ** --scgi Accept SCGI rather than HTTP
3070 ** --skin LABEL Use override skin LABEL
3071 ** --th-trace Trace TH1 execution (for debugging purposes)
3072 ** --usepidkey Use saved encryption key from parent process. This is
3073 ** only necessary when using SEE on Windows.
3074 **
3075 ** See also: [[cgi]], [[http]], [[winsrv]]
3076 */
3077
M src/merge.c
+3 -3
--- src/merge.c
+++ src/merge.c
@@ -314,15 +314,15 @@
314314
 ** --cherrypick Do a cherrypick merge VERSION into the current
315315
 ** checkout. A cherrypick merge pulls in the changes
316316
 ** of the single check-in VERSION, rather than all
317317
 ** changes back to the nearest common ancestor.
318318
 **
319
-** -f|--force Force the merge even if it would be a no-op.
319
+** -f|--force Force the merge even if it would be a no-op
320320
 **
321
-** --force-missing Force the merge even if there is missing content.
321
+** --force-missing Force the merge even if there is missing content
322322
 **
323
-** --integrate Merged branch will be closed when committing.
323
+** --integrate Merged branch will be closed when committing
324324
 **
325325
 ** -K|--keep-merge-files On merge conflict, retain the temporary files
326326
 ** used for merging, named *-baseline, *-original,
327327
 ** and *-merge.
328328
 **
329329
--- src/merge.c
+++ src/merge.c
@@ -314,15 +314,15 @@
314 ** --cherrypick Do a cherrypick merge VERSION into the current
315 ** checkout. A cherrypick merge pulls in the changes
316 ** of the single check-in VERSION, rather than all
317 ** changes back to the nearest common ancestor.
318 **
319 ** -f|--force Force the merge even if it would be a no-op.
320 **
321 ** --force-missing Force the merge even if there is missing content.
322 **
323 ** --integrate Merged branch will be closed when committing.
324 **
325 ** -K|--keep-merge-files On merge conflict, retain the temporary files
326 ** used for merging, named *-baseline, *-original,
327 ** and *-merge.
328 **
329
--- src/merge.c
+++ src/merge.c
@@ -314,15 +314,15 @@
314 ** --cherrypick Do a cherrypick merge VERSION into the current
315 ** checkout. A cherrypick merge pulls in the changes
316 ** of the single check-in VERSION, rather than all
317 ** changes back to the nearest common ancestor.
318 **
319 ** -f|--force Force the merge even if it would be a no-op
320 **
321 ** --force-missing Force the merge even if there is missing content
322 **
323 ** --integrate Merged branch will be closed when committing
324 **
325 ** -K|--keep-merge-files On merge conflict, retain the temporary files
326 ** used for merging, named *-baseline, *-original,
327 ** and *-merge.
328 **
329
M src/merge.c
+3 -3
--- src/merge.c
+++ src/merge.c
@@ -314,15 +314,15 @@
314314
 ** --cherrypick Do a cherrypick merge VERSION into the current
315315
 ** checkout. A cherrypick merge pulls in the changes
316316
 ** of the single check-in VERSION, rather than all
317317
 ** changes back to the nearest common ancestor.
318318
 **
319
-** -f|--force Force the merge even if it would be a no-op.
319
+** -f|--force Force the merge even if it would be a no-op
320320
 **
321
-** --force-missing Force the merge even if there is missing content.
321
+** --force-missing Force the merge even if there is missing content
322322
 **
323
-** --integrate Merged branch will be closed when committing.
323
+** --integrate Merged branch will be closed when committing
324324
 **
325325
 ** -K|--keep-merge-files On merge conflict, retain the temporary files
326326
 ** used for merging, named *-baseline, *-original,
327327
 ** and *-merge.
328328
 **
329329
--- src/merge.c
+++ src/merge.c
@@ -314,15 +314,15 @@
314 ** --cherrypick Do a cherrypick merge VERSION into the current
315 ** checkout. A cherrypick merge pulls in the changes
316 ** of the single check-in VERSION, rather than all
317 ** changes back to the nearest common ancestor.
318 **
319 ** -f|--force Force the merge even if it would be a no-op.
320 **
321 ** --force-missing Force the merge even if there is missing content.
322 **
323 ** --integrate Merged branch will be closed when committing.
324 **
325 ** -K|--keep-merge-files On merge conflict, retain the temporary files
326 ** used for merging, named *-baseline, *-original,
327 ** and *-merge.
328 **
329
--- src/merge.c
+++ src/merge.c
@@ -314,15 +314,15 @@
314 ** --cherrypick Do a cherrypick merge VERSION into the current
315 ** checkout. A cherrypick merge pulls in the changes
316 ** of the single check-in VERSION, rather than all
317 ** changes back to the nearest common ancestor.
318 **
319 ** -f|--force Force the merge even if it would be a no-op
320 **
321 ** --force-missing Force the merge even if there is missing content
322 **
323 ** --integrate Merged branch will be closed when committing
324 **
325 ** -K|--keep-merge-files On merge conflict, retain the temporary files
326 ** used for merging, named *-baseline, *-original,
327 ** and *-merge.
328 **
329
M src/patch.c
+6 -6
--- src/patch.c
+++ src/patch.c
@@ -845,22 +845,22 @@
845845
 ** Create a new binary patch in FILENAME that captures all uncommitted
846846
 ** changes in the check-out at DIRECTORY, or the current directory if
847847
 ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848848
 ** is written to standard output.
849849
 **
850
-** -f|--force Overwrite an existing patch with the same name.
850
+** -f|--force Overwrite an existing patch with the same name
851851
 **
852852
 ** > fossil patch apply [DIRECTORY] FILENAME
853853
 **
854854
 ** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855855
 ** in the current directory if DIRECTORY is omitted. Options:
856856
 **
857857
 ** -f|--force Apply the patch even though there are unsaved
858858
 ** changes in the current check-out. Unsaved changes
859859
 ** are reverted and permanently lost.
860
-** -n|--dry-run Do nothing, but print what would have happened.
861
-** -v|--verbose Extra output explaining what happens.
860
+** -n|--dry-run Do nothing, but print what would have happened
861
+** -v|--verbose Extra output explaining what happens
862862
 **
863863
 ** > fossil patch diff [DIRECTORY] FILENAME
864864
 **
865865
 ** Show a human-readable diff for the patch. All the usual
866866
 ** diff flags described at "fossil help diff" apply. In addition:
@@ -884,12 +884,12 @@
884884
 ** -f|--force Apply the patch even though there are unsaved
885885
 ** changes in the current check-out. Unsaved
886886
 ** changes will be reverted and then the patch is
887887
 ** applied.
888888
 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889
-** -n|--dry-run Do nothing, but print what would have happened.
890
-** -v|--verbose Extra output explaining what happens.
889
+** -n|--dry-run Do nothing, but print what would have happened
890
+** -v|--verbose Extra output explaining what happens
891891
 **
892892
 **
893893
 ** > fossil patch pull REMOTE-CHECKOUT
894894
 **
895895
 ** Like "fossil patch push" except that the transfer is from remote
@@ -898,11 +898,11 @@
898898
 ** > fossil patch view FILENAME
899899
 **
900900
 ** View a summary of the changes in the binary patch FILENAME.
901901
 ** Use "fossil patch diff" for detailed patch content.
902902
 **
903
-** -v|--verbose Show extra detail about the patch.
903
+** -v|--verbose Show extra detail about the patch
904904
 **
905905
 */
906906
 void patch_cmd(void){
907907
 const char *zCmd;
908908
 size_t n;
909909
--- src/patch.c
+++ src/patch.c
@@ -845,22 +845,22 @@
845 ** Create a new binary patch in FILENAME that captures all uncommitted
846 ** changes in the check-out at DIRECTORY, or the current directory if
847 ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848 ** is written to standard output.
849 **
850 ** -f|--force Overwrite an existing patch with the same name.
851 **
852 ** > fossil patch apply [DIRECTORY] FILENAME
853 **
854 ** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855 ** in the current directory if DIRECTORY is omitted. Options:
856 **
857 ** -f|--force Apply the patch even though there are unsaved
858 ** changes in the current check-out. Unsaved changes
859 ** are reverted and permanently lost.
860 ** -n|--dry-run Do nothing, but print what would have happened.
861 ** -v|--verbose Extra output explaining what happens.
862 **
863 ** > fossil patch diff [DIRECTORY] FILENAME
864 **
865 ** Show a human-readable diff for the patch. All the usual
866 ** diff flags described at "fossil help diff" apply. In addition:
@@ -884,12 +884,12 @@
884 ** -f|--force Apply the patch even though there are unsaved
885 ** changes in the current check-out. Unsaved
886 ** changes will be reverted and then the patch is
887 ** applied.
888 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889 ** -n|--dry-run Do nothing, but print what would have happened.
890 ** -v|--verbose Extra output explaining what happens.
891 **
892 **
893 ** > fossil patch pull REMOTE-CHECKOUT
894 **
895 ** Like "fossil patch push" except that the transfer is from remote
@@ -898,11 +898,11 @@
898 ** > fossil patch view FILENAME
899 **
900 ** View a summary of the changes in the binary patch FILENAME.
901 ** Use "fossil patch diff" for detailed patch content.
902 **
903 ** -v|--verbose Show extra detail about the patch.
904 **
905 */
906 void patch_cmd(void){
907 const char *zCmd;
908 size_t n;
909
--- src/patch.c
+++ src/patch.c
@@ -845,22 +845,22 @@
845 ** Create a new binary patch in FILENAME that captures all uncommitted
846 ** changes in the check-out at DIRECTORY, or the current directory if
847 ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848 ** is written to standard output.
849 **
850 ** -f|--force Overwrite an existing patch with the same name
851 **
852 ** > fossil patch apply [DIRECTORY] FILENAME
853 **
854 ** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855 ** in the current directory if DIRECTORY is omitted. Options:
856 **
857 ** -f|--force Apply the patch even though there are unsaved
858 ** changes in the current check-out. Unsaved changes
859 ** are reverted and permanently lost.
860 ** -n|--dry-run Do nothing, but print what would have happened
861 ** -v|--verbose Extra output explaining what happens
862 **
863 ** > fossil patch diff [DIRECTORY] FILENAME
864 **
865 ** Show a human-readable diff for the patch. All the usual
866 ** diff flags described at "fossil help diff" apply. In addition:
@@ -884,12 +884,12 @@
884 ** -f|--force Apply the patch even though there are unsaved
885 ** changes in the current check-out. Unsaved
886 ** changes will be reverted and then the patch is
887 ** applied.
888 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889 ** -n|--dry-run Do nothing, but print what would have happened
890 ** -v|--verbose Extra output explaining what happens
891 **
892 **
893 ** > fossil patch pull REMOTE-CHECKOUT
894 **
895 ** Like "fossil patch push" except that the transfer is from remote
@@ -898,11 +898,11 @@
898 ** > fossil patch view FILENAME
899 **
900 ** View a summary of the changes in the binary patch FILENAME.
901 ** Use "fossil patch diff" for detailed patch content.
902 **
903 ** -v|--verbose Show extra detail about the patch
904 **
905 */
906 void patch_cmd(void){
907 const char *zCmd;
908 size_t n;
909
M src/patch.c
+6 -6
--- src/patch.c
+++ src/patch.c
@@ -845,22 +845,22 @@
845845
 ** Create a new binary patch in FILENAME that captures all uncommitted
846846
 ** changes in the check-out at DIRECTORY, or the current directory if
847847
 ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848848
 ** is written to standard output.
849849
 **
850
-** -f|--force Overwrite an existing patch with the same name.
850
+** -f|--force Overwrite an existing patch with the same name
851851
 **
852852
 ** > fossil patch apply [DIRECTORY] FILENAME
853853
 **
854854
 ** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855855
 ** in the current directory if DIRECTORY is omitted. Options:
856856
 **
857857
 ** -f|--force Apply the patch even though there are unsaved
858858
 ** changes in the current check-out. Unsaved changes
859859
 ** are reverted and permanently lost.
860
-** -n|--dry-run Do nothing, but print what would have happened.
861
-** -v|--verbose Extra output explaining what happens.
860
+** -n|--dry-run Do nothing, but print what would have happened
861
+** -v|--verbose Extra output explaining what happens
862862
 **
863863
 ** > fossil patch diff [DIRECTORY] FILENAME
864864
 **
865865
 ** Show a human-readable diff for the patch. All the usual
866866
 ** diff flags described at "fossil help diff" apply. In addition:
@@ -884,12 +884,12 @@
884884
 ** -f|--force Apply the patch even though there are unsaved
885885
 ** changes in the current check-out. Unsaved
886886
 ** changes will be reverted and then the patch is
887887
 ** applied.
888888
 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889
-** -n|--dry-run Do nothing, but print what would have happened.
890
-** -v|--verbose Extra output explaining what happens.
889
+** -n|--dry-run Do nothing, but print what would have happened
890
+** -v|--verbose Extra output explaining what happens
891891
 **
892892
 **
893893
 ** > fossil patch pull REMOTE-CHECKOUT
894894
 **
895895
 ** Like "fossil patch push" except that the transfer is from remote
@@ -898,11 +898,11 @@
898898
 ** > fossil patch view FILENAME
899899
 **
900900
 ** View a summary of the changes in the binary patch FILENAME.
901901
 ** Use "fossil patch diff" for detailed patch content.
902902
 **
903
-** -v|--verbose Show extra detail about the patch.
903
+** -v|--verbose Show extra detail about the patch
904904
 **
905905
 */
906906
 void patch_cmd(void){
907907
 const char *zCmd;
908908
 size_t n;
909909
--- src/patch.c
+++ src/patch.c
@@ -845,22 +845,22 @@
845 ** Create a new binary patch in FILENAME that captures all uncommitted
846 ** changes in the check-out at DIRECTORY, or the current directory if
847 ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848 ** is written to standard output.
849 **
850 ** -f|--force Overwrite an existing patch with the same name.
851 **
852 ** > fossil patch apply [DIRECTORY] FILENAME
853 **
854 ** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855 ** in the current directory if DIRECTORY is omitted. Options:
856 **
857 ** -f|--force Apply the patch even though there are unsaved
858 ** changes in the current check-out. Unsaved changes
859 ** are reverted and permanently lost.
860 ** -n|--dry-run Do nothing, but print what would have happened.
861 ** -v|--verbose Extra output explaining what happens.
862 **
863 ** > fossil patch diff [DIRECTORY] FILENAME
864 **
865 ** Show a human-readable diff for the patch. All the usual
866 ** diff flags described at "fossil help diff" apply. In addition:
@@ -884,12 +884,12 @@
884 ** -f|--force Apply the patch even though there are unsaved
885 ** changes in the current check-out. Unsaved
886 ** changes will be reverted and then the patch is
887 ** applied.
888 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889 ** -n|--dry-run Do nothing, but print what would have happened.
890 ** -v|--verbose Extra output explaining what happens.
891 **
892 **
893 ** > fossil patch pull REMOTE-CHECKOUT
894 **
895 ** Like "fossil patch push" except that the transfer is from remote
@@ -898,11 +898,11 @@
898 ** > fossil patch view FILENAME
899 **
900 ** View a summary of the changes in the binary patch FILENAME.
901 ** Use "fossil patch diff" for detailed patch content.
902 **
903 ** -v|--verbose Show extra detail about the patch.
904 **
905 */
906 void patch_cmd(void){
907 const char *zCmd;
908 size_t n;
909
--- src/patch.c
+++ src/patch.c
@@ -845,22 +845,22 @@
845 ** Create a new binary patch in FILENAME that captures all uncommitted
846 ** changes in the check-out at DIRECTORY, or the current directory if
847 ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch
848 ** is written to standard output.
849 **
850 ** -f|--force Overwrite an existing patch with the same name
851 **
852 ** > fossil patch apply [DIRECTORY] FILENAME
853 **
854 ** Apply the changes in FILENAME to the check-out at DIRECTORY, or
855 ** in the current directory if DIRECTORY is omitted. Options:
856 **
857 ** -f|--force Apply the patch even though there are unsaved
858 ** changes in the current check-out. Unsaved changes
859 ** are reverted and permanently lost.
860 ** -n|--dry-run Do nothing, but print what would have happened
861 ** -v|--verbose Extra output explaining what happens
862 **
863 ** > fossil patch diff [DIRECTORY] FILENAME
864 **
865 ** Show a human-readable diff for the patch. All the usual
866 ** diff flags described at "fossil help diff" apply. In addition:
@@ -884,12 +884,12 @@
884 ** -f|--force Apply the patch even though there are unsaved
885 ** changes in the current check-out. Unsaved
886 ** changes will be reverted and then the patch is
887 ** applied.
888 ** --fossilcmd EXE Name of the "fossil" executable on the remote
889 ** -n|--dry-run Do nothing, but print what would have happened
890 ** -v|--verbose Extra output explaining what happens
891 **
892 **
893 ** > fossil patch pull REMOTE-CHECKOUT
894 **
895 ** Like "fossil patch push" except that the transfer is from remote
@@ -898,11 +898,11 @@
898 ** > fossil patch view FILENAME
899 **
900 ** View a summary of the changes in the binary patch FILENAME.
901 ** Use "fossil patch diff" for detailed patch content.
902 **
903 ** -v|--verbose Show extra detail about the patch
904 **
905 */
906 void patch_cmd(void){
907 const char *zCmd;
908 size_t n;
909
M src/pikchrshow.c
+13 -13
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -528,42 +528,42 @@
528528
 **
529529
 ** Options:
530530
 **
531531
 ** -div On success, add a DIV wrapper around the
532532
 ** resulting SVG output which limits its max-width to
533
-** its computed maximum ideal size.
534
-**
535
-** -div-indent Like -div but indent the div.
536
-**
537
-** -div-center Like -div but center the div.
538
-**
539
-** -div-left Like -div but float the div left.
540
-**
541
-** -div-right Like -div but float the div right.
533
+** its computed maximum ideal size
534
+**
535
+** -div-indent Like -div but indent the div
536
+**
537
+** -div-center Like -div but center the div
538
+**
539
+** -div-left Like -div but float the div left
540
+**
541
+** -div-right Like -div but float the div right
542542
 **
543543
 ** -div-toggle Set the 'toggle' CSS class on the div (used by the
544
-** JavaScript-side post-processor).
544
+** JavaScript-side post-processor)
545545
 **
546546
 ** -div-source Set the 'source' CSS class on the div, which tells
547547
 ** CSS to hide the SVG and reveal the source by default.
548548
 **
549549
 ** -src Store the input pikchr's source code in the output as
550550
 ** a separate element adjacent to the SVG one. Implied
551551
 ** by -div-source.
552552
 **
553553
 **
554
-** -th Process the input using TH1 before passing it to pikchr.
554
+** -th Process the input using TH1 before passing it to pikchr
555555
 **
556556
 ** -th-novar Disable $var and $<var> TH1 processing. Use this if the
557557
 ** pikchr script uses '$' for its own purposes and that
558558
 ** causes issues. This only affects parsing of '$' outside
559559
 ** of TH1 script blocks. Code in such blocks is unaffected.
560560
 **
561561
 ** -th-nosvg When using -th, output the post-TH1'd script
562
-** instead of the pikchr-rendered output.
562
+** instead of the pikchr-rendered output
563563
 **
564
-** -th-trace Trace TH1 execution (for debugging purposes).
564
+** -th-trace Trace TH1 execution (for debugging purposes)
565565
 **
566566
 **
567567
 ** The -div-indent/center/left/right flags may not be combined.
568568
 **
569569
 ** TH1-related Notes and Caveats:
570570
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -528,42 +528,42 @@
528 **
529 ** Options:
530 **
531 ** -div On success, add a DIV wrapper around the
532 ** resulting SVG output which limits its max-width to
533 ** its computed maximum ideal size.
534 **
535 ** -div-indent Like -div but indent the div.
536 **
537 ** -div-center Like -div but center the div.
538 **
539 ** -div-left Like -div but float the div left.
540 **
541 ** -div-right Like -div but float the div right.
542 **
543 ** -div-toggle Set the 'toggle' CSS class on the div (used by the
544 ** JavaScript-side post-processor).
545 **
546 ** -div-source Set the 'source' CSS class on the div, which tells
547 ** CSS to hide the SVG and reveal the source by default.
548 **
549 ** -src Store the input pikchr's source code in the output as
550 ** a separate element adjacent to the SVG one. Implied
551 ** by -div-source.
552 **
553 **
554 ** -th Process the input using TH1 before passing it to pikchr.
555 **
556 ** -th-novar Disable $var and $<var> TH1 processing. Use this if the
557 ** pikchr script uses '$' for its own purposes and that
558 ** causes issues. This only affects parsing of '$' outside
559 ** of TH1 script blocks. Code in such blocks is unaffected.
560 **
561 ** -th-nosvg When using -th, output the post-TH1'd script
562 ** instead of the pikchr-rendered output.
563 **
564 ** -th-trace Trace TH1 execution (for debugging purposes).
565 **
566 **
567 ** The -div-indent/center/left/right flags may not be combined.
568 **
569 ** TH1-related Notes and Caveats:
570
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -528,42 +528,42 @@
528 **
529 ** Options:
530 **
531 ** -div On success, add a DIV wrapper around the
532 ** resulting SVG output which limits its max-width to
533 ** its computed maximum ideal size
534 **
535 ** -div-indent Like -div but indent the div
536 **
537 ** -div-center Like -div but center the div
538 **
539 ** -div-left Like -div but float the div left
540 **
541 ** -div-right Like -div but float the div right
542 **
543 ** -div-toggle Set the 'toggle' CSS class on the div (used by the
544 ** JavaScript-side post-processor)
545 **
546 ** -div-source Set the 'source' CSS class on the div, which tells
547 ** CSS to hide the SVG and reveal the source by default.
548 **
549 ** -src Store the input pikchr's source code in the output as
550 ** a separate element adjacent to the SVG one. Implied
551 ** by -div-source.
552 **
553 **
554 ** -th Process the input using TH1 before passing it to pikchr
555 **
556 ** -th-novar Disable $var and $<var> TH1 processing. Use this if the
557 ** pikchr script uses '$' for its own purposes and that
558 ** causes issues. This only affects parsing of '$' outside
559 ** of TH1 script blocks. Code in such blocks is unaffected.
560 **
561 ** -th-nosvg When using -th, output the post-TH1'd script
562 ** instead of the pikchr-rendered output
563 **
564 ** -th-trace Trace TH1 execution (for debugging purposes)
565 **
566 **
567 ** The -div-indent/center/left/right flags may not be combined.
568 **
569 ** TH1-related Notes and Caveats:
570
M src/pikchrshow.c
+13 -13
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -528,42 +528,42 @@
528528
 **
529529
 ** Options:
530530
 **
531531
 ** -div On success, add a DIV wrapper around the
532532
 ** resulting SVG output which limits its max-width to
533
-** its computed maximum ideal size.
534
-**
535
-** -div-indent Like -div but indent the div.
536
-**
537
-** -div-center Like -div but center the div.
538
-**
539
-** -div-left Like -div but float the div left.
540
-**
541
-** -div-right Like -div but float the div right.
533
+** its computed maximum ideal size
534
+**
535
+** -div-indent Like -div but indent the div
536
+**
537
+** -div-center Like -div but center the div
538
+**
539
+** -div-left Like -div but float the div left
540
+**
541
+** -div-right Like -div but float the div right
542542
 **
543543
 ** -div-toggle Set the 'toggle' CSS class on the div (used by the
544
-** JavaScript-side post-processor).
544
+** JavaScript-side post-processor)
545545
 **
546546
 ** -div-source Set the 'source' CSS class on the div, which tells
547547
 ** CSS to hide the SVG and reveal the source by default.
548548
 **
549549
 ** -src Store the input pikchr's source code in the output as
550550
 ** a separate element adjacent to the SVG one. Implied
551551
 ** by -div-source.
552552
 **
553553
 **
554
-** -th Process the input using TH1 before passing it to pikchr.
554
+** -th Process the input using TH1 before passing it to pikchr
555555
 **
556556
 ** -th-novar Disable $var and $<var> TH1 processing. Use this if the
557557
 ** pikchr script uses '$' for its own purposes and that
558558
 ** causes issues. This only affects parsing of '$' outside
559559
 ** of TH1 script blocks. Code in such blocks is unaffected.
560560
 **
561561
 ** -th-nosvg When using -th, output the post-TH1'd script
562
-** instead of the pikchr-rendered output.
562
+** instead of the pikchr-rendered output
563563
 **
564
-** -th-trace Trace TH1 execution (for debugging purposes).
564
+** -th-trace Trace TH1 execution (for debugging purposes)
565565
 **
566566
 **
567567
 ** The -div-indent/center/left/right flags may not be combined.
568568
 **
569569
 ** TH1-related Notes and Caveats:
570570
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -528,42 +528,42 @@
528 **
529 ** Options:
530 **
531 ** -div On success, add a DIV wrapper around the
532 ** resulting SVG output which limits its max-width to
533 ** its computed maximum ideal size.
534 **
535 ** -div-indent Like -div but indent the div.
536 **
537 ** -div-center Like -div but center the div.
538 **
539 ** -div-left Like -div but float the div left.
540 **
541 ** -div-right Like -div but float the div right.
542 **
543 ** -div-toggle Set the 'toggle' CSS class on the div (used by the
544 ** JavaScript-side post-processor).
545 **
546 ** -div-source Set the 'source' CSS class on the div, which tells
547 ** CSS to hide the SVG and reveal the source by default.
548 **
549 ** -src Store the input pikchr's source code in the output as
550 ** a separate element adjacent to the SVG one. Implied
551 ** by -div-source.
552 **
553 **
554 ** -th Process the input using TH1 before passing it to pikchr.
555 **
556 ** -th-novar Disable $var and $<var> TH1 processing. Use this if the
557 ** pikchr script uses '$' for its own purposes and that
558 ** causes issues. This only affects parsing of '$' outside
559 ** of TH1 script blocks. Code in such blocks is unaffected.
560 **
561 ** -th-nosvg When using -th, output the post-TH1'd script
562 ** instead of the pikchr-rendered output.
563 **
564 ** -th-trace Trace TH1 execution (for debugging purposes).
565 **
566 **
567 ** The -div-indent/center/left/right flags may not be combined.
568 **
569 ** TH1-related Notes and Caveats:
570
--- src/pikchrshow.c
+++ src/pikchrshow.c
@@ -528,42 +528,42 @@
528 **
529 ** Options:
530 **
531 ** -div On success, add a DIV wrapper around the
532 ** resulting SVG output which limits its max-width to
533 ** its computed maximum ideal size
534 **
535 ** -div-indent Like -div but indent the div
536 **
537 ** -div-center Like -div but center the div
538 **
539 ** -div-left Like -div but float the div left
540 **
541 ** -div-right Like -div but float the div right
542 **
543 ** -div-toggle Set the 'toggle' CSS class on the div (used by the
544 ** JavaScript-side post-processor)
545 **
546 ** -div-source Set the 'source' CSS class on the div, which tells
547 ** CSS to hide the SVG and reveal the source by default.
548 **
549 ** -src Store the input pikchr's source code in the output as
550 ** a separate element adjacent to the SVG one. Implied
551 ** by -div-source.
552 **
553 **
554 ** -th Process the input using TH1 before passing it to pikchr
555 **
556 ** -th-novar Disable $var and $<var> TH1 processing. Use this if the
557 ** pikchr script uses '$' for its own purposes and that
558 ** causes issues. This only affects parsing of '$' outside
559 ** of TH1 script blocks. Code in such blocks is unaffected.
560 **
561 ** -th-nosvg When using -th, output the post-TH1'd script
562 ** instead of the pikchr-rendered output
563 **
564 ** -th-trace Trace TH1 execution (for debugging purposes)
565 **
566 **
567 ** The -div-indent/center/left/right flags may not be combined.
568 **
569 ** TH1-related Notes and Caveats:
570
M src/rebuild.c
+5 -5
--- src/rebuild.c
+++ src/rebuild.c
@@ -1336,19 +1336,19 @@
13361336
 ** 40+ character artifact ID, AA the first 2 characters.
13371337
 ** If -L|--prefixlength is given, the length (default 2) of the directory prefix
13381338
 ** can be set to 0,1,..,9 characters.
13391339
 **
13401340
 ** Options:
1341
-** -R|--repository REPO Deconstruct given REPOSITORY.
1341
+** -R|--repository REPO Deconstruct given REPOSITORY
13421342
 ** -K|--keep-rid1 Save the filename of the artifact with RID=1 to
1343
-** the file .rid1 in the DESTINATION directory.
1343
+** the file .rid1 in the DESTINATION directory
13441344
 ** -L|--prefixlength N Set the length of the names of the DESTINATION
1345
-** subdirectories to N.
1346
-** --private Include private artifacts.
1345
+** subdirectories to N
1346
+** --private Include private artifacts
13471347
 ** -P|--keep-private Save the list of private artifacts to the file
13481348
 ** .private in the DESTINATION directory (implies
1349
-** the --private option).
1349
+** the --private option)
13501350
 */
13511351
 void deconstruct_cmd(void){
13521352
 const char *zPrefixOpt;
13531353
 Stmt s;
13541354
 int privateFlag;
13551355
--- src/rebuild.c
+++ src/rebuild.c
@@ -1336,19 +1336,19 @@
1336 ** 40+ character artifact ID, AA the first 2 characters.
1337 ** If -L|--prefixlength is given, the length (default 2) of the directory prefix
1338 ** can be set to 0,1,..,9 characters.
1339 **
1340 ** Options:
1341 ** -R|--repository REPO Deconstruct given REPOSITORY.
1342 ** -K|--keep-rid1 Save the filename of the artifact with RID=1 to
1343 ** the file .rid1 in the DESTINATION directory.
1344 ** -L|--prefixlength N Set the length of the names of the DESTINATION
1345 ** subdirectories to N.
1346 ** --private Include private artifacts.
1347 ** -P|--keep-private Save the list of private artifacts to the file
1348 ** .private in the DESTINATION directory (implies
1349 ** the --private option).
1350 */
1351 void deconstruct_cmd(void){
1352 const char *zPrefixOpt;
1353 Stmt s;
1354 int privateFlag;
1355
--- src/rebuild.c
+++ src/rebuild.c
@@ -1336,19 +1336,19 @@
1336 ** 40+ character artifact ID, AA the first 2 characters.
1337 ** If -L|--prefixlength is given, the length (default 2) of the directory prefix
1338 ** can be set to 0,1,..,9 characters.
1339 **
1340 ** Options:
1341 ** -R|--repository REPO Deconstruct given REPOSITORY
1342 ** -K|--keep-rid1 Save the filename of the artifact with RID=1 to
1343 ** the file .rid1 in the DESTINATION directory
1344 ** -L|--prefixlength N Set the length of the names of the DESTINATION
1345 ** subdirectories to N
1346 ** --private Include private artifacts
1347 ** -P|--keep-private Save the list of private artifacts to the file
1348 ** .private in the DESTINATION directory (implies
1349 ** the --private option)
1350 */
1351 void deconstruct_cmd(void){
1352 const char *zPrefixOpt;
1353 Stmt s;
1354 int privateFlag;
1355
M src/rss.c
+4 -4
--- src/rss.c
+++ src/rss.c
@@ -233,19 +233,19 @@
233233
 **
234234
 ** The CLI variant of the /timeline.rss page, this produces an RSS
235235
 ** feed of the timeline to stdout. Options:
236236
 **
237237
 ** -type|y FLAG May be: all (default), ci (show check-ins only),
238
-** t (show tickets only), w (show wiki only).
238
+** t (show tickets only), w (show wiki only)
239239
 **
240
-** -limit|n LIMIT The maximum number of items to show.
240
+** -limit|n LIMIT The maximum number of items to show
241241
 **
242
-** -tkt HASH Filter for only those events for the specified ticket.
242
+** -tkt HASH Filter for only those events for the specified ticket
243243
 **
244244
 ** -tag TAG Filter for a tag
245245
 **
246
-** -wiki NAME Filter on a specific wiki page.
246
+** -wiki NAME Filter on a specific wiki page
247247
 **
248248
 ** Only one of -tkt, -tag, or -wiki may be used.
249249
 **
250250
 ** -name FILENAME Filter for a specific file. This may be combined
251251
 ** with one of the other filters (useful for looking
252252
--- src/rss.c
+++ src/rss.c
@@ -233,19 +233,19 @@
233 **
234 ** The CLI variant of the /timeline.rss page, this produces an RSS
235 ** feed of the timeline to stdout. Options:
236 **
237 ** -type|y FLAG May be: all (default), ci (show check-ins only),
238 ** t (show tickets only), w (show wiki only).
239 **
240 ** -limit|n LIMIT The maximum number of items to show.
241 **
242 ** -tkt HASH Filter for only those events for the specified ticket.
243 **
244 ** -tag TAG Filter for a tag
245 **
246 ** -wiki NAME Filter on a specific wiki page.
247 **
248 ** Only one of -tkt, -tag, or -wiki may be used.
249 **
250 ** -name FILENAME Filter for a specific file. This may be combined
251 ** with one of the other filters (useful for looking
252
--- src/rss.c
+++ src/rss.c
@@ -233,19 +233,19 @@
233 **
234 ** The CLI variant of the /timeline.rss page, this produces an RSS
235 ** feed of the timeline to stdout. Options:
236 **
237 ** -type|y FLAG May be: all (default), ci (show check-ins only),
238 ** t (show tickets only), w (show wiki only)
239 **
240 ** -limit|n LIMIT The maximum number of items to show
241 **
242 ** -tkt HASH Filter for only those events for the specified ticket
243 **
244 ** -tag TAG Filter for a tag
245 **
246 ** -wiki NAME Filter on a specific wiki page
247 **
248 ** Only one of -tkt, -tag, or -wiki may be used.
249 **
250 ** -name FILENAME Filter for a specific file. This may be combined
251 ** with one of the other filters (useful for looking
252
M src/search.c
+2 -2
--- src/search.c
+++ src/search.c
@@ -584,12 +584,12 @@
584584
 ** returned. The -width option can be used to set the output width used
585585
 ** when printing matches.
586586
 **
587587
 ** Options:
588588
 **
589
-** -a|--all Output all matches, not just best matches.
590
-** -n|--limit N Limit output to N matches.
589
+** -a|--all Output all matches, not just best matches
590
+** -n|--limit N Limit output to N matches
591591
 ** -W|--width WIDTH Set display width to WIDTH columns, 0 for
592592
 ** unlimited. Defaults the terminal's width.
593593
 */
594594
 void search_cmd(void){
595595
 Blob pattern;
596596
--- src/search.c
+++ src/search.c
@@ -584,12 +584,12 @@
584 ** returned. The -width option can be used to set the output width used
585 ** when printing matches.
586 **
587 ** Options:
588 **
589 ** -a|--all Output all matches, not just best matches.
590 ** -n|--limit N Limit output to N matches.
591 ** -W|--width WIDTH Set display width to WIDTH columns, 0 for
592 ** unlimited. Defaults the terminal's width.
593 */
594 void search_cmd(void){
595 Blob pattern;
596
--- src/search.c
+++ src/search.c
@@ -584,12 +584,12 @@
584 ** returned. The -width option can be used to set the output width used
585 ** when printing matches.
586 **
587 ** Options:
588 **
589 ** -a|--all Output all matches, not just best matches
590 ** -n|--limit N Limit output to N matches
591 ** -W|--width WIDTH Set display width to WIDTH columns, 0 for
592 ** unlimited. Defaults the terminal's width.
593 */
594 void search_cmd(void){
595 Blob pattern;
596
M src/sqlcmd.c
+1 -1
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -331,11 +331,11 @@
331331
 ** running any SQL commands that modify the repository database. Use the
332332
 ** --readonly option to prevent accidental damage to the repository.
333333
 **
334334
 ** Options:
335335
 **
336
-** --no-repository Skip opening the repository database.
336
+** --no-repository Skip opening the repository database
337337
 **
338338
 ** --readonly Open the repository read-only. No changes
339339
 ** are allowed. This is a recommended safety
340340
 ** precaution to prevent repository damage.
341341
 **
342342
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -331,11 +331,11 @@
331 ** running any SQL commands that modify the repository database. Use the
332 ** --readonly option to prevent accidental damage to the repository.
333 **
334 ** Options:
335 **
336 ** --no-repository Skip opening the repository database.
337 **
338 ** --readonly Open the repository read-only. No changes
339 ** are allowed. This is a recommended safety
340 ** precaution to prevent repository damage.
341 **
342
--- src/sqlcmd.c
+++ src/sqlcmd.c
@@ -331,11 +331,11 @@
331 ** running any SQL commands that modify the repository database. Use the
332 ** --readonly option to prevent accidental damage to the repository.
333 **
334 ** Options:
335 **
336 ** --no-repository Skip opening the repository database
337 **
338 ** --readonly Open the repository read-only. No changes
339 ** are allowed. This is a recommended safety
340 ** precaution to prevent repository damage.
341 **
342
M src/stat.c
+3 -3
--- src/stat.c
+++ src/stat.c
@@ -334,16 +334,16 @@
334334
 ** Shows statistics and global information about the repository and/or
335335
 ** verify the integrity of a repository.
336336
 **
337337
 ** Options:
338338
 **
339
-** -b|--brief Only show essential elements.
340
-** --db-check Run "PRAGMA quick_check" on the repository database.
339
+** -b|--brief Only show essential elements
340
+** --db-check Run "PRAGMA quick_check" on the repository database
341341
 ** --db-verify Run a full verification of the repository integrity.
342342
 ** This involves decoding and reparsing all artifacts
343343
 ** and can take significant time.
344
-** --omit-version-info Omit the SQLite and Fossil version information.
344
+** --omit-version-info Omit the SQLite and Fossil version information
345345
 */
346346
 void dbstat_cmd(void){
347347
 i64 t, fsize;
348348
 int n, m;
349349
 int szMax, szAvg;
350350
--- src/stat.c
+++ src/stat.c
@@ -334,16 +334,16 @@
334 ** Shows statistics and global information about the repository and/or
335 ** verify the integrity of a repository.
336 **
337 ** Options:
338 **
339 ** -b|--brief Only show essential elements.
340 ** --db-check Run "PRAGMA quick_check" on the repository database.
341 ** --db-verify Run a full verification of the repository integrity.
342 ** This involves decoding and reparsing all artifacts
343 ** and can take significant time.
344 ** --omit-version-info Omit the SQLite and Fossil version information.
345 */
346 void dbstat_cmd(void){
347 i64 t, fsize;
348 int n, m;
349 int szMax, szAvg;
350
--- src/stat.c
+++ src/stat.c
@@ -334,16 +334,16 @@
334 ** Shows statistics and global information about the repository and/or
335 ** verify the integrity of a repository.
336 **
337 ** Options:
338 **
339 ** -b|--brief Only show essential elements
340 ** --db-check Run "PRAGMA quick_check" on the repository database
341 ** --db-verify Run a full verification of the repository integrity.
342 ** This involves decoding and reparsing all artifacts
343 ** and can take significant time.
344 ** --omit-version-info Omit the SQLite and Fossil version information
345 */
346 void dbstat_cmd(void){
347 i64 t, fsize;
348 int n, m;
349 int szMax, szAvg;
350
M src/tag.c
+10 -10
--- src/tag.c
+++ src/tag.c
@@ -404,15 +404,15 @@
404404
 ** propagates to all descendants of that artifact.
405405
 **
406406
 ** Options:
407407
 ** --raw Raw tag name. Ignored for
408408
 ** non-CHECK-IN artifacts.
409
-** --propagate Propagating tag.
410
-** --date-override DATETIME Set date and time added.
411
-** --user-override USER Name USER when adding the tag.
409
+** --propagate Propagating tag
410
+** --date-override DATETIME Set date and time added
411
+** --user-override USER Name USER when adding the tag
412412
 ** -n|--dry-run Display the tag text, but do not
413
-** actually insert it into the database.
413
+** actually insert it into the database
414414
 **
415415
 ** The --date-override and --user-override options support
416416
 ** importing history from other SCM systems. DATETIME has
417417
 ** the form 'YYYY-MMM-DD HH:MM:SS'.
418418
 **
@@ -429,14 +429,14 @@
429429
 ** forbidden, as documented for the 'add' subcommand.
430430
 **
431431
 ** Options:
432432
 ** --raw Raw tag name. Ignored for
433433
 ** non-CHECK-IN artifacts.
434
-** --date-override DATETIME Set date and time deleted.
435
-** --user-override USER Name USER when deleting the tag.
434
+** --date-override DATETIME Set date and time deleted
435
+** --user-override USER Name USER when deleting the tag
436436
 ** -n|--dry-run Display the control artifact, but do
437
-** not insert it into the database.
437
+** not insert it into the database
438438
 **
439439
 ** > fossil tag find ?OPTIONS? TAGNAME
440440
 **
441441
 ** List all objects that use TAGNAME.
442442
 **
@@ -447,11 +447,11 @@
447447
 ** hashes of matching objects.
448448
 ** -t|--type TYPE One of: ci (check-in), w (wiki),
449449
 ** e (event/technote), f (forum post),
450450
 ** t (ticket). Default is all types. Ignored
451451
 ** if --raw is used.
452
-** -n|--limit N Limit to N results.
452
+** -n|--limit N Limit to N results
453453
 **
454454
 ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID?
455455
 **
456456
 ** List all tags or, if ARTIFACT-ID is supplied, all tags and
457457
 ** their values for that artifact. The tagtype option accepts
@@ -462,12 +462,12 @@
462462
 **
463463
 ** Options:
464464
 ** --raw List raw names of tags
465465
 ** --tagtype TYPE List only tags of type TYPE, which must
466466
 ** be one of: cancel, singleton, propagated
467
-** -v|--inverse Inverse the meaning of --tagtype TYPE.
468
-** --prefix List only tags with the given prefix.
467
+** -v|--inverse Inverse the meaning of --tagtype TYPE
468
+** --prefix List only tags with the given prefix
469469
 ** Fossil-internal prefixes include "sym-"
470470
 ** (branch name), "wiki-", "event-"
471471
 ** (technote), and "tkt-" (ticket). The
472472
 ** prefix is stripped from the resulting
473473
 ** list unless --raw is provided. Ignored if
474474
--- src/tag.c
+++ src/tag.c
@@ -404,15 +404,15 @@
404 ** propagates to all descendants of that artifact.
405 **
406 ** Options:
407 ** --raw Raw tag name. Ignored for
408 ** non-CHECK-IN artifacts.
409 ** --propagate Propagating tag.
410 ** --date-override DATETIME Set date and time added.
411 ** --user-override USER Name USER when adding the tag.
412 ** -n|--dry-run Display the tag text, but do not
413 ** actually insert it into the database.
414 **
415 ** The --date-override and --user-override options support
416 ** importing history from other SCM systems. DATETIME has
417 ** the form 'YYYY-MMM-DD HH:MM:SS'.
418 **
@@ -429,14 +429,14 @@
429 ** forbidden, as documented for the 'add' subcommand.
430 **
431 ** Options:
432 ** --raw Raw tag name. Ignored for
433 ** non-CHECK-IN artifacts.
434 ** --date-override DATETIME Set date and time deleted.
435 ** --user-override USER Name USER when deleting the tag.
436 ** -n|--dry-run Display the control artifact, but do
437 ** not insert it into the database.
438 **
439 ** > fossil tag find ?OPTIONS? TAGNAME
440 **
441 ** List all objects that use TAGNAME.
442 **
@@ -447,11 +447,11 @@
447 ** hashes of matching objects.
448 ** -t|--type TYPE One of: ci (check-in), w (wiki),
449 ** e (event/technote), f (forum post),
450 ** t (ticket). Default is all types. Ignored
451 ** if --raw is used.
452 ** -n|--limit N Limit to N results.
453 **
454 ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID?
455 **
456 ** List all tags or, if ARTIFACT-ID is supplied, all tags and
457 ** their values for that artifact. The tagtype option accepts
@@ -462,12 +462,12 @@
462 **
463 ** Options:
464 ** --raw List raw names of tags
465 ** --tagtype TYPE List only tags of type TYPE, which must
466 ** be one of: cancel, singleton, propagated
467 ** -v|--inverse Inverse the meaning of --tagtype TYPE.
468 ** --prefix List only tags with the given prefix.
469 ** Fossil-internal prefixes include "sym-"
470 ** (branch name), "wiki-", "event-"
471 ** (technote), and "tkt-" (ticket). The
472 ** prefix is stripped from the resulting
473 ** list unless --raw is provided. Ignored if
474
--- src/tag.c
+++ src/tag.c
@@ -404,15 +404,15 @@
404 ** propagates to all descendants of that artifact.
405 **
406 ** Options:
407 ** --raw Raw tag name. Ignored for
408 ** non-CHECK-IN artifacts.
409 ** --propagate Propagating tag
410 ** --date-override DATETIME Set date and time added
411 ** --user-override USER Name USER when adding the tag
412 ** -n|--dry-run Display the tag text, but do not
413 ** actually insert it into the database
414 **
415 ** The --date-override and --user-override options support
416 ** importing history from other SCM systems. DATETIME has
417 ** the form 'YYYY-MMM-DD HH:MM:SS'.
418 **
@@ -429,14 +429,14 @@
429 ** forbidden, as documented for the 'add' subcommand.
430 **
431 ** Options:
432 ** --raw Raw tag name. Ignored for
433 ** non-CHECK-IN artifacts.
434 ** --date-override DATETIME Set date and time deleted
435 ** --user-override USER Name USER when deleting the tag
436 ** -n|--dry-run Display the control artifact, but do
437 ** not insert it into the database
438 **
439 ** > fossil tag find ?OPTIONS? TAGNAME
440 **
441 ** List all objects that use TAGNAME.
442 **
@@ -447,11 +447,11 @@
447 ** hashes of matching objects.
448 ** -t|--type TYPE One of: ci (check-in), w (wiki),
449 ** e (event/technote), f (forum post),
450 ** t (ticket). Default is all types. Ignored
451 ** if --raw is used.
452 ** -n|--limit N Limit to N results
453 **
454 ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID?
455 **
456 ** List all tags or, if ARTIFACT-ID is supplied, all tags and
457 ** their values for that artifact. The tagtype option accepts
@@ -462,12 +462,12 @@
462 **
463 ** Options:
464 ** --raw List raw names of tags
465 ** --tagtype TYPE List only tags of type TYPE, which must
466 ** be one of: cancel, singleton, propagated
467 ** -v|--inverse Inverse the meaning of --tagtype TYPE
468 ** --prefix List only tags with the given prefix
469 ** Fossil-internal prefixes include "sym-"
470 ** (branch name), "wiki-", "event-"
471 ** (technote), and "tkt-" (ticket). The
472 ** prefix is stripped from the resulting
473 ** list unless --raw is provided. Ignored if
474
M src/tag.c
+10 -10
--- src/tag.c
+++ src/tag.c
@@ -404,15 +404,15 @@
404404
 ** propagates to all descendants of that artifact.
405405
 **
406406
 ** Options:
407407
 ** --raw Raw tag name. Ignored for
408408
 ** non-CHECK-IN artifacts.
409
-** --propagate Propagating tag.
410
-** --date-override DATETIME Set date and time added.
411
-** --user-override USER Name USER when adding the tag.
409
+** --propagate Propagating tag
410
+** --date-override DATETIME Set date and time added
411
+** --user-override USER Name USER when adding the tag
412412
 ** -n|--dry-run Display the tag text, but do not
413
-** actually insert it into the database.
413
+** actually insert it into the database
414414
 **
415415
 ** The --date-override and --user-override options support
416416
 ** importing history from other SCM systems. DATETIME has
417417
 ** the form 'YYYY-MMM-DD HH:MM:SS'.
418418
 **
@@ -429,14 +429,14 @@
429429
 ** forbidden, as documented for the 'add' subcommand.
430430
 **
431431
 ** Options:
432432
 ** --raw Raw tag name. Ignored for
433433
 ** non-CHECK-IN artifacts.
434
-** --date-override DATETIME Set date and time deleted.
435
-** --user-override USER Name USER when deleting the tag.
434
+** --date-override DATETIME Set date and time deleted
435
+** --user-override USER Name USER when deleting the tag
436436
 ** -n|--dry-run Display the control artifact, but do
437
-** not insert it into the database.
437
+** not insert it into the database
438438
 **
439439
 ** > fossil tag find ?OPTIONS? TAGNAME
440440
 **
441441
 ** List all objects that use TAGNAME.
442442
 **
@@ -447,11 +447,11 @@
447447
 ** hashes of matching objects.
448448
 ** -t|--type TYPE One of: ci (check-in), w (wiki),
449449
 ** e (event/technote), f (forum post),
450450
 ** t (ticket). Default is all types. Ignored
451451
 ** if --raw is used.
452
-** -n|--limit N Limit to N results.
452
+** -n|--limit N Limit to N results
453453
 **
454454
 ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID?
455455
 **
456456
 ** List all tags or, if ARTIFACT-ID is supplied, all tags and
457457
 ** their values for that artifact. The tagtype option accepts
@@ -462,12 +462,12 @@
462462
 **
463463
 ** Options:
464464
 ** --raw List raw names of tags
465465
 ** --tagtype TYPE List only tags of type TYPE, which must
466466
 ** be one of: cancel, singleton, propagated
467
-** -v|--inverse Inverse the meaning of --tagtype TYPE.
468
-** --prefix List only tags with the given prefix.
467
+** -v|--inverse Inverse the meaning of --tagtype TYPE
468
+** --prefix List only tags with the given prefix
469469
 ** Fossil-internal prefixes include "sym-"
470470
 ** (branch name), "wiki-", "event-"
471471
 ** (technote), and "tkt-" (ticket). The
472472
 ** prefix is stripped from the resulting
473473
 ** list unless --raw is provided. Ignored if
474474
--- src/tag.c
+++ src/tag.c
@@ -404,15 +404,15 @@
404 ** propagates to all descendants of that artifact.
405 **
406 ** Options:
407 ** --raw Raw tag name. Ignored for
408 ** non-CHECK-IN artifacts.
409 ** --propagate Propagating tag.
410 ** --date-override DATETIME Set date and time added.
411 ** --user-override USER Name USER when adding the tag.
412 ** -n|--dry-run Display the tag text, but do not
413 ** actually insert it into the database.
414 **
415 ** The --date-override and --user-override options support
416 ** importing history from other SCM systems. DATETIME has
417 ** the form 'YYYY-MMM-DD HH:MM:SS'.
418 **
@@ -429,14 +429,14 @@
429 ** forbidden, as documented for the 'add' subcommand.
430 **
431 ** Options:
432 ** --raw Raw tag name. Ignored for
433 ** non-CHECK-IN artifacts.
434 ** --date-override DATETIME Set date and time deleted.
435 ** --user-override USER Name USER when deleting the tag.
436 ** -n|--dry-run Display the control artifact, but do
437 ** not insert it into the database.
438 **
439 ** > fossil tag find ?OPTIONS? TAGNAME
440 **
441 ** List all objects that use TAGNAME.
442 **
@@ -447,11 +447,11 @@
447 ** hashes of matching objects.
448 ** -t|--type TYPE One of: ci (check-in), w (wiki),
449 ** e (event/technote), f (forum post),
450 ** t (ticket). Default is all types. Ignored
451 ** if --raw is used.
452 ** -n|--limit N Limit to N results.
453 **
454 ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID?
455 **
456 ** List all tags or, if ARTIFACT-ID is supplied, all tags and
457 ** their values for that artifact. The tagtype option accepts
@@ -462,12 +462,12 @@
462 **
463 ** Options:
464 ** --raw List raw names of tags
465 ** --tagtype TYPE List only tags of type TYPE, which must
466 ** be one of: cancel, singleton, propagated
467 ** -v|--inverse Inverse the meaning of --tagtype TYPE.
468 ** --prefix List only tags with the given prefix.
469 ** Fossil-internal prefixes include "sym-"
470 ** (branch name), "wiki-", "event-"
471 ** (technote), and "tkt-" (ticket). The
472 ** prefix is stripped from the resulting
473 ** list unless --raw is provided. Ignored if
474
--- src/tag.c
+++ src/tag.c
@@ -404,15 +404,15 @@
404 ** propagates to all descendants of that artifact.
405 **
406 ** Options:
407 ** --raw Raw tag name. Ignored for
408 ** non-CHECK-IN artifacts.
409 ** --propagate Propagating tag
410 ** --date-override DATETIME Set date and time added
411 ** --user-override USER Name USER when adding the tag
412 ** -n|--dry-run Display the tag text, but do not
413 ** actually insert it into the database
414 **
415 ** The --date-override and --user-override options support
416 ** importing history from other SCM systems. DATETIME has
417 ** the form 'YYYY-MMM-DD HH:MM:SS'.
418 **
@@ -429,14 +429,14 @@
429 ** forbidden, as documented for the 'add' subcommand.
430 **
431 ** Options:
432 ** --raw Raw tag name. Ignored for
433 ** non-CHECK-IN artifacts.
434 ** --date-override DATETIME Set date and time deleted
435 ** --user-override USER Name USER when deleting the tag
436 ** -n|--dry-run Display the control artifact, but do
437 ** not insert it into the database
438 **
439 ** > fossil tag find ?OPTIONS? TAGNAME
440 **
441 ** List all objects that use TAGNAME.
442 **
@@ -447,11 +447,11 @@
447 ** hashes of matching objects.
448 ** -t|--type TYPE One of: ci (check-in), w (wiki),
449 ** e (event/technote), f (forum post),
450 ** t (ticket). Default is all types. Ignored
451 ** if --raw is used.
452 ** -n|--limit N Limit to N results
453 **
454 ** > fossil tag list|ls ?OPTIONS? ?ARTIFACT-ID?
455 **
456 ** List all tags or, if ARTIFACT-ID is supplied, all tags and
457 ** their values for that artifact. The tagtype option accepts
@@ -462,12 +462,12 @@
462 **
463 ** Options:
464 ** --raw List raw names of tags
465 ** --tagtype TYPE List only tags of type TYPE, which must
466 ** be one of: cancel, singleton, propagated
467 ** -v|--inverse Inverse the meaning of --tagtype TYPE
468 ** --prefix List only tags with the given prefix
469 ** Fossil-internal prefixes include "sym-"
470 ** (branch name), "wiki-", "event-"
471 ** (technote), and "tkt-" (ticket). The
472 ** prefix is stripped from the resulting
473 ** list unless --raw is provided. Ignored if
474
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -3134,11 +3134,11 @@
31343134
 ** --medium Medium-verbose entry formatting
31353135
 ** --full Extra verbose entry formatting
31363136
 ** -n|--limit N If N is positive, output the first N entries. If
31373137
 ** N is negative, output the first -N lines. If N is
31383138
 ** zero, no limit. Default is -20 meaning 20 lines.
3139
-** --offset P skip P changes
3139
+** --offset P Skip P changes
31403140
 ** -p|--path PATH Output items affecting PATH only.
31413141
 ** PATH can be a file or a sub directory.
31423142
 ** -R REPO_FILE Specifies the repository db to use. Default is
31433143
 ** the current checkout's repository.
31443144
 ** --sql Show the SQL used to generate the timeline
31453145
--- src/timeline.c
+++ src/timeline.c
@@ -3134,11 +3134,11 @@
3134 ** --medium Medium-verbose entry formatting
3135 ** --full Extra verbose entry formatting
3136 ** -n|--limit N If N is positive, output the first N entries. If
3137 ** N is negative, output the first -N lines. If N is
3138 ** zero, no limit. Default is -20 meaning 20 lines.
3139 ** --offset P skip P changes
3140 ** -p|--path PATH Output items affecting PATH only.
3141 ** PATH can be a file or a sub directory.
3142 ** -R REPO_FILE Specifies the repository db to use. Default is
3143 ** the current checkout's repository.
3144 ** --sql Show the SQL used to generate the timeline
3145
--- src/timeline.c
+++ src/timeline.c
@@ -3134,11 +3134,11 @@
3134 ** --medium Medium-verbose entry formatting
3135 ** --full Extra verbose entry formatting
3136 ** -n|--limit N If N is positive, output the first N entries. If
3137 ** N is negative, output the first -N lines. If N is
3138 ** zero, no limit. Default is -20 meaning 20 lines.
3139 ** --offset P Skip P changes
3140 ** -p|--path PATH Output items affecting PATH only.
3141 ** PATH can be a file or a sub directory.
3142 ** -R REPO_FILE Specifies the repository db to use. Default is
3143 ** the current checkout's repository.
3144 ** --sql Show the SQL used to generate the timeline
3145
M src/timeline.c
+1 -1
--- src/timeline.c
+++ src/timeline.c
@@ -3134,11 +3134,11 @@
31343134
 ** --medium Medium-verbose entry formatting
31353135
 ** --full Extra verbose entry formatting
31363136
 ** -n|--limit N If N is positive, output the first N entries. If
31373137
 ** N is negative, output the first -N lines. If N is
31383138
 ** zero, no limit. Default is -20 meaning 20 lines.
3139
-** --offset P skip P changes
3139
+** --offset P Skip P changes
31403140
 ** -p|--path PATH Output items affecting PATH only.
31413141
 ** PATH can be a file or a sub directory.
31423142
 ** -R REPO_FILE Specifies the repository db to use. Default is
31433143
 ** the current checkout's repository.
31443144
 ** --sql Show the SQL used to generate the timeline
31453145
--- src/timeline.c
+++ src/timeline.c
@@ -3134,11 +3134,11 @@
3134 ** --medium Medium-verbose entry formatting
3135 ** --full Extra verbose entry formatting
3136 ** -n|--limit N If N is positive, output the first N entries. If
3137 ** N is negative, output the first -N lines. If N is
3138 ** zero, no limit. Default is -20 meaning 20 lines.
3139 ** --offset P skip P changes
3140 ** -p|--path PATH Output items affecting PATH only.
3141 ** PATH can be a file or a sub directory.
3142 ** -R REPO_FILE Specifies the repository db to use. Default is
3143 ** the current checkout's repository.
3144 ** --sql Show the SQL used to generate the timeline
3145
--- src/timeline.c
+++ src/timeline.c
@@ -3134,11 +3134,11 @@
3134 ** --medium Medium-verbose entry formatting
3135 ** --full Extra verbose entry formatting
3136 ** -n|--limit N If N is positive, output the first N entries. If
3137 ** N is negative, output the first -N lines. If N is
3138 ** zero, no limit. Default is -20 meaning 20 lines.
3139 ** --offset P Skip P changes
3140 ** -p|--path PATH Output items affecting PATH only.
3141 ** PATH can be a file or a sub directory.
3142 ** -R REPO_FILE Specifies the repository db to use. Default is
3143 ** the current checkout's repository.
3144 ** --sql Show the SQL used to generate the timeline
3145
M src/undo.c
+1 -1
--- src/undo.c
+++ src/undo.c
@@ -462,11 +462,11 @@
462462
 **
463463
 ** Future versions of Fossil might add new commands to the set of commands
464464
 ** that are undoable.
465465
 **
466466
 ** Options:
467
-** -n|--dry-run Do not make changes but show what would be done
467
+** -n|--dry-run Do not make changes, but show what would be done
468468
 **
469469
 ** See also: [[commit]], [[status]]
470470
 */
471471
 void undo_cmd(void){
472472
 int isRedo = g.argv[1][0]=='r';
473473
--- src/undo.c
+++ src/undo.c
@@ -462,11 +462,11 @@
462 **
463 ** Future versions of Fossil might add new commands to the set of commands
464 ** that are undoable.
465 **
466 ** Options:
467 ** -n|--dry-run Do not make changes but show what would be done
468 **
469 ** See also: [[commit]], [[status]]
470 */
471 void undo_cmd(void){
472 int isRedo = g.argv[1][0]=='r';
473
--- src/undo.c
+++ src/undo.c
@@ -462,11 +462,11 @@
462 **
463 ** Future versions of Fossil might add new commands to the set of commands
464 ** that are undoable.
465 **
466 ** Options:
467 ** -n|--dry-run Do not make changes, but show what would be done
468 **
469 ** See also: [[commit]], [[status]]
470 */
471 void undo_cmd(void){
472 int isRedo = g.argv[1][0]=='r';
473
M src/undo.c
+1 -1
--- src/undo.c
+++ src/undo.c
@@ -462,11 +462,11 @@
462462
 **
463463
 ** Future versions of Fossil might add new commands to the set of commands
464464
 ** that are undoable.
465465
 **
466466
 ** Options:
467
-** -n|--dry-run Do not make changes but show what would be done
467
+** -n|--dry-run Do not make changes, but show what would be done
468468
 **
469469
 ** See also: [[commit]], [[status]]
470470
 */
471471
 void undo_cmd(void){
472472
 int isRedo = g.argv[1][0]=='r';
473473
--- src/undo.c
+++ src/undo.c
@@ -462,11 +462,11 @@
462 **
463 ** Future versions of Fossil might add new commands to the set of commands
464 ** that are undoable.
465 **
466 ** Options:
467 ** -n|--dry-run Do not make changes but show what would be done
468 **
469 ** See also: [[commit]], [[status]]
470 */
471 void undo_cmd(void){
472 int isRedo = g.argv[1][0]=='r';
473
--- src/undo.c
+++ src/undo.c
@@ -462,11 +462,11 @@
462 **
463 ** Future versions of Fossil might add new commands to the set of commands
464 ** that are undoable.
465 **
466 ** Options:
467 ** -n|--dry-run Do not make changes, but show what would be done
468 **
469 ** See also: [[commit]], [[status]]
470 */
471 void undo_cmd(void){
472 int isRedo = g.argv[1][0]=='r';
473

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button