c965636958e… — Fossil SCM

M src/add.c

+16 -16

		--- src/add.c
		+++ src/add.c
		@@ -320,11 +320,11 @@
320	320	** COMMAND: add
321	321	**
322	322	** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
323	323	**
324	324	** Make arrangements to add one or more files or directories to the
325		-** current checkout at the next commit.
	325	+** current checkout at the next [[commit]].
326	326	**
327	327	** When adding files or directories recursively, filenames that begin
328	328	** with "." are excluded by default. To include such files, add
329	329	** the "--dotfiles" option to the command-line.
330	330	**
		@@ -359,11 +359,11 @@
359	359	**
360	360	** The following options are only valid with --reset:
361	361	** -v\|--verbose Outputs information about each --reset file.
362	362	** -n\|--dry-run Display instead of run actions.
363	363	**
364		-** See also: addremove, rm
	364	+** See also: [[addremove]], [[rm]]
365	365	*/
366	366	void add_cmd(void){
367	367	int i; /* Loop counter */
368	368	int vid; /* Currently checked out version */
369	369	int nRoot; /* Full path characters in g.zLocalRoot */
		@@ -541,11 +541,11 @@
541	541	** than --verbose or --dry-run may be used with
542	542	** --reset.
543	543	** --verbose\|-v Outputs information about each --reset file.
544	544	** Only usable with --reset.
545	545	**
546		-** See also: addremove, add
	546	+** See also: [[addremove]], [[add]]
547	547	*/
548	548	void delete_cmd(void){
549	549	int i;
550	550	int removeFiles;
551	551	int dryRunFlag = find_option("dry-run","n",0)!=0;
		@@ -689,22 +689,22 @@
689	689	/*
690	690	** COMMAND: addremove
691	691	**
692	692	** Usage: %fossil addremove ?OPTIONS?
693	693	**
694		-** Do all necessary "add" and "rm" commands to synchronize the repository
695		-** with the content of the working checkout:
	694	+** Do all necessary "[[add]]" and "[[rm]]" commands to synchronize the
	695	+** repository with the content of the working checkout:
696	696	**
697	697	** * All files in the checkout but not in the repository (that is,
698	698	** all files displayed using the "extras" command) are added as
699		-** if by the "add" command.
	699	+** if by the "[[add]]" command.
700	700	**
701	701	** * All files in the repository but missing from the checkout (that is,
702	702	** all files that show as MISSING with the "status" command) are
703		-** removed as if by the "rm" command.
	703	+** removed as if by the "[[rm]]" command.
704	704	**
705		-** The command does not "commit". You must run the "commit" separately
	705	+** The command does not "[[commit]]". You must run the "[[commit]]" separately
706	706	** as a separate step.
707	707	**
708	708	** Files and directories whose names begin with "." are ignored unless
709	709	** the --dotfiles option is used.
710	710	**
		@@ -733,11 +733,11 @@
733	733	** removed. No flags other than --verbose and
734	734	** --dry-run may be used with --reset.
735	735	** --verbose\|-v Outputs information about each --reset file.
736	736	** Only usable with --reset.
737	737	**
738		-** See also: add, rm
	738	+** See also: [[add]], [[rm]]
739	739	*/
740	740	void addremove_cmd(void){
741	741	Blob path;
742	742	const char *zCleanFlag;
743	743	const char *zIgnoreFlag;
		@@ -953,11 +953,11 @@
953	953	** Move or rename one or more files or directories within the repository tree.
954	954	** You can either rename a file or directory or move it to another subdirectory.
955	955	**
956	956	** The 'mv' command does NOT normally rename or move the files on disk.
957	957	** This command merely records the fact that file names have changed so
958		-** that appropriate notations can be made at the next commit/check-in.
	958	+** that appropriate notations can be made at the next [[commit]].
959	959	** However, the default behavior of this command may be overridden via
960	960	** command line options listed below and/or the 'mv-rm-files' setting.
961	961	**
962	962	** The 'rename' command never renames or moves files on disk, even when the
963	963	** command line options and/or the 'mv-rm-files' setting would otherwise
		@@ -966,17 +966,17 @@
966	966	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
967	967	** setting is non-zero, files WILL BE renamed or moved on disk
968	968	** as well. This does NOT apply to the 'rename' command.
969	969	**
970	970	** Options:
971		-** --soft Skip moving files within the checkout.
972		-** This supersedes the --hard option.
973		-** --hard Move files within the checkout.
974		-** --case-sensitive <BOOL> Override the case-sensitive setting.
975		-** -n\|--dry-run If given, display instead of run actions.
	971	+** --soft Skip moving files within the checkout.
	972	+** This supersedes the --hard option.
	973	+** --hard Move files within the checkout.
	974	+** --case-sensitive <BOOL> Override the case-sensitive setting.
	975	+** -n\|--dry-run If given, display instead of run actions.
976	976	**
977		-** See also: changes, status
	977	+** See also: [[changes]], [[status]]
978	978	*/
979	979	void mv_cmd(void){
980	980	int i;
981	981	int vid;
982	982	int moveFiles;
983	983

	--- src/add.c
	+++ src/add.c
	@@ -320,11 +320,11 @@
320	** COMMAND: add
321	**
322	** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
323	**
324	** Make arrangements to add one or more files or directories to the
325	** current checkout at the next commit.
326	**
327	** When adding files or directories recursively, filenames that begin
328	** with "." are excluded by default. To include such files, add
329	** the "--dotfiles" option to the command-line.
330	**
	@@ -359,11 +359,11 @@
359	**
360	** The following options are only valid with --reset:
361	** -v\|--verbose Outputs information about each --reset file.
362	** -n\|--dry-run Display instead of run actions.
363	**
364	** See also: addremove, rm
365	*/
366	void add_cmd(void){
367	int i; /* Loop counter */
368	int vid; /* Currently checked out version */
369	int nRoot; /* Full path characters in g.zLocalRoot */
	@@ -541,11 +541,11 @@
541	** than --verbose or --dry-run may be used with
542	** --reset.
543	** --verbose\|-v Outputs information about each --reset file.
544	** Only usable with --reset.
545	**
546	** See also: addremove, add
547	*/
548	void delete_cmd(void){
549	int i;
550	int removeFiles;
551	int dryRunFlag = find_option("dry-run","n",0)!=0;
	@@ -689,22 +689,22 @@
689	/*
690	** COMMAND: addremove
691	**
692	** Usage: %fossil addremove ?OPTIONS?
693	**
694	** Do all necessary "add" and "rm" commands to synchronize the repository
695	** with the content of the working checkout:
696	**
697	** * All files in the checkout but not in the repository (that is,
698	** all files displayed using the "extras" command) are added as
699	** if by the "add" command.
700	**
701	** * All files in the repository but missing from the checkout (that is,
702	** all files that show as MISSING with the "status" command) are
703	** removed as if by the "rm" command.
704	**
705	** The command does not "commit". You must run the "commit" separately
706	** as a separate step.
707	**
708	** Files and directories whose names begin with "." are ignored unless
709	** the --dotfiles option is used.
710	**
	@@ -733,11 +733,11 @@
733	** removed. No flags other than --verbose and
734	** --dry-run may be used with --reset.
735	** --verbose\|-v Outputs information about each --reset file.
736	** Only usable with --reset.
737	**
738	** See also: add, rm
739	*/
740	void addremove_cmd(void){
741	Blob path;
742	const char *zCleanFlag;
743	const char *zIgnoreFlag;
	@@ -953,11 +953,11 @@
953	** Move or rename one or more files or directories within the repository tree.
954	** You can either rename a file or directory or move it to another subdirectory.
955	**
956	** The 'mv' command does NOT normally rename or move the files on disk.
957	** This command merely records the fact that file names have changed so
958	** that appropriate notations can be made at the next commit/check-in.
959	** However, the default behavior of this command may be overridden via
960	** command line options listed below and/or the 'mv-rm-files' setting.
961	**
962	** The 'rename' command never renames or moves files on disk, even when the
963	** command line options and/or the 'mv-rm-files' setting would otherwise
	@@ -966,17 +966,17 @@
966	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
967	** setting is non-zero, files WILL BE renamed or moved on disk
968	** as well. This does NOT apply to the 'rename' command.
969	**
970	** Options:
971	** --soft Skip moving files within the checkout.
972	** This supersedes the --hard option.
973	** --hard Move files within the checkout.
974	** --case-sensitive <BOOL> Override the case-sensitive setting.
975	** -n\|--dry-run If given, display instead of run actions.
976	**
977	** See also: changes, status
978	*/
979	void mv_cmd(void){
980	int i;
981	int vid;
982	int moveFiles;
983

	--- src/add.c
	+++ src/add.c
	@@ -320,11 +320,11 @@
320	** COMMAND: add
321	**
322	** Usage: %fossil add ?OPTIONS? FILE1 ?FILE2 ...?
323	**
324	** Make arrangements to add one or more files or directories to the
325	** current checkout at the next [[commit]].
326	**
327	** When adding files or directories recursively, filenames that begin
328	** with "." are excluded by default. To include such files, add
329	** the "--dotfiles" option to the command-line.
330	**
	@@ -359,11 +359,11 @@
359	**
360	** The following options are only valid with --reset:
361	** -v\|--verbose Outputs information about each --reset file.
362	** -n\|--dry-run Display instead of run actions.
363	**
364	** See also: [[addremove]], [[rm]]
365	*/
366	void add_cmd(void){
367	int i; /* Loop counter */
368	int vid; /* Currently checked out version */
369	int nRoot; /* Full path characters in g.zLocalRoot */
	@@ -541,11 +541,11 @@
541	** than --verbose or --dry-run may be used with
542	** --reset.
543	** --verbose\|-v Outputs information about each --reset file.
544	** Only usable with --reset.
545	**
546	** See also: [[addremove]], [[add]]
547	*/
548	void delete_cmd(void){
549	int i;
550	int removeFiles;
551	int dryRunFlag = find_option("dry-run","n",0)!=0;
	@@ -689,22 +689,22 @@
689	/*
690	** COMMAND: addremove
691	**
692	** Usage: %fossil addremove ?OPTIONS?
693	**
694	** Do all necessary "[[add]]" and "[[rm]]" commands to synchronize the
695	** repository with the content of the working checkout:
696	**
697	** * All files in the checkout but not in the repository (that is,
698	** all files displayed using the "extras" command) are added as
699	** if by the "[[add]]" command.
700	**
701	** * All files in the repository but missing from the checkout (that is,
702	** all files that show as MISSING with the "status" command) are
703	** removed as if by the "[[rm]]" command.
704	**
705	** The command does not "[[commit]]". You must run the "[[commit]]" separately
706	** as a separate step.
707	**
708	** Files and directories whose names begin with "." are ignored unless
709	** the --dotfiles option is used.
710	**
	@@ -733,11 +733,11 @@
733	** removed. No flags other than --verbose and
734	** --dry-run may be used with --reset.
735	** --verbose\|-v Outputs information about each --reset file.
736	** Only usable with --reset.
737	**
738	** See also: [[add]], [[rm]]
739	*/
740	void addremove_cmd(void){
741	Blob path;
742	const char *zCleanFlag;
743	const char *zIgnoreFlag;
	@@ -953,11 +953,11 @@
953	** Move or rename one or more files or directories within the repository tree.
954	** You can either rename a file or directory or move it to another subdirectory.
955	**
956	** The 'mv' command does NOT normally rename or move the files on disk.
957	** This command merely records the fact that file names have changed so
958	** that appropriate notations can be made at the next [[commit]].
959	** However, the default behavior of this command may be overridden via
960	** command line options listed below and/or the 'mv-rm-files' setting.
961	**
962	** The 'rename' command never renames or moves files on disk, even when the
963	** command line options and/or the 'mv-rm-files' setting would otherwise
	@@ -966,17 +966,17 @@
966	** WARNING: If the "--hard" option is specified -OR- the "mv-rm-files"
967	** setting is non-zero, files WILL BE renamed or moved on disk
968	** as well. This does NOT apply to the 'rename' command.
969	**
970	** Options:
971	** --soft Skip moving files within the checkout.
972	** This supersedes the --hard option.
973	** --hard Move files within the checkout.
974	** --case-sensitive <BOOL> Override the case-sensitive setting.
975	** -n\|--dry-run If given, display instead of run actions.
976	**
977	** See also: [[changes]], [[status]]
978	*/
979	void mv_cmd(void){
980	int i;
981	int vid;
982	int moveFiles;
983

M src/bisect.c

+2 -1

		--- src/bisect.c
		+++ src/bisect.c
		@@ -381,11 +381,12 @@
381	381	/*
382	382	** COMMAND: bisect
383	383	**
384	384	** Usage: %fossil bisect SUBCOMMAND ...
385	385	**
386		-** Run various subcommands useful for searching for bugs.
	386	+** Run various subcommands useful for searching back through the change
	387	+** history for a particular checkin that causes or fixes a problem.
387	388	**
388	389	** > fossil bisect bad ?VERSION?
389	390	**
390	391	** Identify version VERSION as non-working. If VERSION is omitted,
391	392	** the current checkout is marked as non-working.
392	393

	--- src/bisect.c
	+++ src/bisect.c
	@@ -381,11 +381,12 @@
381	/*
382	** COMMAND: bisect
383	**
384	** Usage: %fossil bisect SUBCOMMAND ...
385	**
386	** Run various subcommands useful for searching for bugs.

387	**
388	** > fossil bisect bad ?VERSION?
389	**
390	** Identify version VERSION as non-working. If VERSION is omitted,
391	** the current checkout is marked as non-working.
392

	--- src/bisect.c
	+++ src/bisect.c
	@@ -381,11 +381,12 @@
381	/*
382	** COMMAND: bisect
383	**
384	** Usage: %fossil bisect SUBCOMMAND ...
385	**
386	** Run various subcommands useful for searching back through the change
387	** history for a particular checkin that causes or fixes a problem.
388	**
389	** > fossil bisect bad ?VERSION?
390	**
391	** Identify version VERSION as non-working. If VERSION is omitted,
392	** the current checkout is marked as non-working.
393

M src/branch.c

-6

		--- src/branch.c
		+++ src/branch.c
		@@ -382,16 +382,10 @@
382	382	** Either no timezone suffix or "Z" means UTC.
383	383	**
384	384	** Options valid for all subcommands:
385	385	**
386	386	** -R\|--repository FILE Run commands on repository FILE
387		-**
388		-** Summary:
389		-** fossil branch current
390		-** fossil branch info BRANCH-NAME
391		-** fossil branch [list\|ls]
392		-** fossil branch new BRANCH-NAME BASIS
393	387	*/
394	388	void branch_cmd(void){
395	389	int n;
396	390	const char *zCmd = "list";
397	391	db_find_and_open_repository(0, 0);
398	392

	--- src/branch.c
	+++ src/branch.c
	@@ -382,16 +382,10 @@
382	** Either no timezone suffix or "Z" means UTC.
383	**
384	** Options valid for all subcommands:
385	**
386	** -R\|--repository FILE Run commands on repository FILE
387	**
388	** Summary:
389	** fossil branch current
390	** fossil branch info BRANCH-NAME
391	** fossil branch [list\|ls]
392	** fossil branch new BRANCH-NAME BASIS
393	*/
394	void branch_cmd(void){
395	int n;
396	const char *zCmd = "list";
397	db_find_and_open_repository(0, 0);
398

	--- src/branch.c
	+++ src/branch.c
	@@ -382,16 +382,10 @@
382	** Either no timezone suffix or "Z" means UTC.
383	**
384	** Options valid for all subcommands:
385	**
386	** -R\|--repository FILE Run commands on repository FILE






387	*/
388	void branch_cmd(void){
389	int n;
390	const char *zCmd = "list";
391	db_find_and_open_repository(0, 0);
392

M src/bundle.c

+1 -15

		--- src/bundle.c
		+++ src/bundle.c
		@@ -768,25 +768,11 @@
768	768	**
769	769	** Remove from the repository all files that are used exclusively
770	770	** by check-ins in BUNDLE. This has the effect of undoing a
771	771	** "fossil bundle import".
772	772	**
773		-** SUMMARY:
774		-** fossil bundle append BUNDLE FILE... Add files to BUNDLE
775		-** fossil bundle cat BUNDLE HASH... Extract file from BUNDLE
776		-** fossil bundle export BUNDLE ?OPTIONS? Create a new BUNDLE
777		-** --branch BRANCH --from TAG1 --to TAG2 Check-ins to include
778		-** --checkin TAG Use only check-in TAG
779		-** --standalone Omit dependencies
780		-** fossil bundle extend BUNDLE Update with newer content
781		-** fossil bundle import BUNDLE ?OPTIONS? Import a bundle
782		-** --publish Publish the import
783		-** --force Cross-repo import
784		-** fossil bundle ls BUNDLE List content of a bundle
785		-** fossil bundle purge BUNDLE Undo an import
786		-**
787		-** See also: publish
	773	+** See also: [[publish]]
788	774	*/
789	775	void bundle_cmd(void){
790	776	const char *zSubcmd;
791	777	int n;
792	778	if( g.argc<4 ) usage("SUBCOMMAND BUNDLE ?OPTIONS?");
793	779

	--- src/bundle.c
	+++ src/bundle.c
	@@ -768,25 +768,11 @@
768	**
769	** Remove from the repository all files that are used exclusively
770	** by check-ins in BUNDLE. This has the effect of undoing a
771	** "fossil bundle import".
772	**
773	** SUMMARY:
774	** fossil bundle append BUNDLE FILE... Add files to BUNDLE
775	** fossil bundle cat BUNDLE HASH... Extract file from BUNDLE
776	** fossil bundle export BUNDLE ?OPTIONS? Create a new BUNDLE
777	** --branch BRANCH --from TAG1 --to TAG2 Check-ins to include
778	** --checkin TAG Use only check-in TAG
779	** --standalone Omit dependencies
780	** fossil bundle extend BUNDLE Update with newer content
781	** fossil bundle import BUNDLE ?OPTIONS? Import a bundle
782	** --publish Publish the import
783	** --force Cross-repo import
784	** fossil bundle ls BUNDLE List content of a bundle
785	** fossil bundle purge BUNDLE Undo an import
786	**
787	** See also: publish
788	*/
789	void bundle_cmd(void){
790	const char *zSubcmd;
791	int n;
792	if( g.argc<4 ) usage("SUBCOMMAND BUNDLE ?OPTIONS?");
793

	--- src/bundle.c
	+++ src/bundle.c
	@@ -768,25 +768,11 @@
768	**
769	** Remove from the repository all files that are used exclusively
770	** by check-ins in BUNDLE. This has the effect of undoing a
771	** "fossil bundle import".
772	**
773	** See also: [[publish]]














774	*/
775	void bundle_cmd(void){
776	const char *zSubcmd;
777	int n;
778	if( g.argc<4 ) usage("SUBCOMMAND BUNDLE ?OPTIONS?");
779

M src/checkin.c

+5 -5

		--- src/checkin.c
		+++ src/checkin.c
		@@ -440,11 +440,11 @@
440	440	** --extra Display unmanaged files.
441	441	** --differ Display modified and extra files.
442	442	** --merge Display merge contributors.
443	443	** --no-merge Do not display merge contributors.
444	444	**
445		-** See also: extras, ls
	445	+** See also: [[extras]], [[ls]]
446	446	*/
447	447	void status_cmd(void){
448	448	/* Affirmative and negative flag option tables. */
449	449	static const struct {
450	450	const char option; / Flag name. */
		@@ -676,11 +676,11 @@
676	676	** -v\|--verbose Provide extra information about each file.
677	677	** -t Sort output in time order.
678	678	** -r VERSION The specific check-in to list.
679	679	** -R\|--repository FILE Extract info from repository FILE.
680	680	**
681		-** See also: changes, extras, status
	681	+** See also: [[changes]], [[extras]], [[status]]
682	682	*/
683	683	void ls_cmd(void){
684	684	int vid;
685	685	Stmt q;
686	686	int verboseFlag;
		@@ -830,11 +830,11 @@
830	830	** --header Identify the repository if there are extras
831	831	** --ignore CSG Ignore files matching patterns from the argument
832	832	** --rel-paths Display pathnames relative to the current working
833	833	** directory.
834	834	**
835		-** See also: changes, clean, status
	835	+** See also: [[changes]], [[clean]], [[status]]
836	836	*/
837	837	void extras_cmd(void){
838	838	Blob report = BLOB_INITIALIZER;
839	839	const char *zIgnoreFlag = find_option("ignore",0,1);
840	840	unsigned scanFlags = find_option("dotfiles",0,0)!=0 ? SCAN_ALL : 0;
		@@ -954,11 +954,11 @@
954	954	** --no-prompt This option disables prompting the user for input
955	955	** and assumes an answer of 'No' for every question.
956	956	** --temp Remove only Fossil-generated temporary files.
957	957	** -v\|--verbose Show all files as they are removed.
958	958	**
959		-** See also: addremove, extras, status
	959	+** See also: [[addremove]], [[extras]], [[status]]
960	960	*/
961	961	void clean_cmd(void){
962	962	int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
963	963	int emptyDirsFlag, dirsOnlyFlag;
964	964	int disableUndo, noPrompt;
		@@ -2091,11 +2091,11 @@
2091	2091	** year-month-day form, it may be truncated, the "T" may be replaced by
2092	2092	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2093	2093	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
2094	2094	** means UTC.
2095	2095	**
2096		-** See also: branch, changes, checkout, extras, sync
	2096	+** See also: [[branch]], [[changes]], [[update]], [[extras]], [[sync]]
2097	2097	*/
2098	2098	void commit_cmd(void){
2099	2099	int hasChanges; /* True if unsaved changes exist */
2100	2100	int vid; /* blob-id of parent version */
2101	2101	int nrid; /* blob-id of a modified file */
2102	2102

	--- src/checkin.c
	+++ src/checkin.c
	@@ -440,11 +440,11 @@
440	** --extra Display unmanaged files.
441	** --differ Display modified and extra files.
442	** --merge Display merge contributors.
443	** --no-merge Do not display merge contributors.
444	**
445	** See also: extras, ls
446	*/
447	void status_cmd(void){
448	/* Affirmative and negative flag option tables. */
449	static const struct {
450	const char option; / Flag name. */
	@@ -676,11 +676,11 @@
676	** -v\|--verbose Provide extra information about each file.
677	** -t Sort output in time order.
678	** -r VERSION The specific check-in to list.
679	** -R\|--repository FILE Extract info from repository FILE.
680	**
681	** See also: changes, extras, status
682	*/
683	void ls_cmd(void){
684	int vid;
685	Stmt q;
686	int verboseFlag;
	@@ -830,11 +830,11 @@
830	** --header Identify the repository if there are extras
831	** --ignore CSG Ignore files matching patterns from the argument
832	** --rel-paths Display pathnames relative to the current working
833	** directory.
834	**
835	** See also: changes, clean, status
836	*/
837	void extras_cmd(void){
838	Blob report = BLOB_INITIALIZER;
839	const char *zIgnoreFlag = find_option("ignore",0,1);
840	unsigned scanFlags = find_option("dotfiles",0,0)!=0 ? SCAN_ALL : 0;
	@@ -954,11 +954,11 @@
954	** --no-prompt This option disables prompting the user for input
955	** and assumes an answer of 'No' for every question.
956	** --temp Remove only Fossil-generated temporary files.
957	** -v\|--verbose Show all files as they are removed.
958	**
959	** See also: addremove, extras, status
960	*/
961	void clean_cmd(void){
962	int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
963	int emptyDirsFlag, dirsOnlyFlag;
964	int disableUndo, noPrompt;
	@@ -2091,11 +2091,11 @@
2091	** year-month-day form, it may be truncated, the "T" may be replaced by
2092	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2093	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
2094	** means UTC.
2095	**
2096	** See also: branch, changes, checkout, extras, sync
2097	*/
2098	void commit_cmd(void){
2099	int hasChanges; /* True if unsaved changes exist */
2100	int vid; /* blob-id of parent version */
2101	int nrid; /* blob-id of a modified file */
2102

	--- src/checkin.c
	+++ src/checkin.c
	@@ -440,11 +440,11 @@
440	** --extra Display unmanaged files.
441	** --differ Display modified and extra files.
442	** --merge Display merge contributors.
443	** --no-merge Do not display merge contributors.
444	**
445	** See also: [[extras]], [[ls]]
446	*/
447	void status_cmd(void){
448	/* Affirmative and negative flag option tables. */
449	static const struct {
450	const char option; / Flag name. */
	@@ -676,11 +676,11 @@
676	** -v\|--verbose Provide extra information about each file.
677	** -t Sort output in time order.
678	** -r VERSION The specific check-in to list.
679	** -R\|--repository FILE Extract info from repository FILE.
680	**
681	** See also: [[changes]], [[extras]], [[status]]
682	*/
683	void ls_cmd(void){
684	int vid;
685	Stmt q;
686	int verboseFlag;
	@@ -830,11 +830,11 @@
830	** --header Identify the repository if there are extras
831	** --ignore CSG Ignore files matching patterns from the argument
832	** --rel-paths Display pathnames relative to the current working
833	** directory.
834	**
835	** See also: [[changes]], [[clean]], [[status]]
836	*/
837	void extras_cmd(void){
838	Blob report = BLOB_INITIALIZER;
839	const char *zIgnoreFlag = find_option("ignore",0,1);
840	unsigned scanFlags = find_option("dotfiles",0,0)!=0 ? SCAN_ALL : 0;
	@@ -954,11 +954,11 @@
954	** --no-prompt This option disables prompting the user for input
955	** and assumes an answer of 'No' for every question.
956	** --temp Remove only Fossil-generated temporary files.
957	** -v\|--verbose Show all files as they are removed.
958	**
959	** See also: [[addremove]], [[extras]], [[status]]
960	*/
961	void clean_cmd(void){
962	int allFileFlag, allDirFlag, dryRunFlag, verboseFlag;
963	int emptyDirsFlag, dirsOnlyFlag;
964	int disableUndo, noPrompt;
	@@ -2091,11 +2091,11 @@
2091	** year-month-day form, it may be truncated, the "T" may be replaced by
2092	** a space, and it may also name a timezone offset from UTC as "-HH:MM"
2093	** (westward) or "+HH:MM" (eastward). Either no timezone suffix or "Z"
2094	** means UTC.
2095	**
2096	** See also: [[branch]], [[changes]], [[update]], [[extras]], [[sync]]
2097	*/
2098	void commit_cmd(void){
2099	int hasChanges; /* True if unsaved changes exist */
2100	int vid; /* blob-id of parent version */
2101	int nrid; /* blob-id of a modified file */
2102

M src/checkout.c

+3 -3

		--- src/checkout.c
		+++ src/checkout.c
		@@ -279,11 +279,11 @@
279	279	** --force-missing Force checkout even if content is missing
280	280	** --setmtime Set timestamps of all files to match their SCM-side
281	281	** times (the timestamp of the last checkin which modified
282	282	** them).
283	283	**
284		-** See also: update
	284	+** See also: [[update]]
285	285	*/
286	286	void checkout_cmd(void){
287	287	int forceFlag; /* Force checkout even if edits exist */
288	288	int forceMissingFlag; /* Force checkout even if missing content */
289	289	int keepFlag; /* Do not change any files on disk */
		@@ -387,18 +387,18 @@
387	387	/*
388	388	** COMMAND: close*
389	389	**
390	390	** Usage: %fossil close ?OPTIONS?
391	391	**
392		-** The opposite of "open". Close the current database connection.
	392	+** The opposite of "[[open]]". Close the current database connection.
393	393	** Require a -f or --force flag if there are unsaved changes in the
394	394	** current check-out or if there is non-empty stash.
395	395	**
396	396	** Options:
397	397	** --force\|-f necessary to close a check out with uncommitted changes
398	398	**
399		-** See also: open
	399	+** See also: [[open]]
400	400	*/
401	401	void close_cmd(void){
402	402	int forceFlag = find_option("force","f",0)!=0;
403	403	db_must_be_within_tree();
404	404
405	405

	--- src/checkout.c
	+++ src/checkout.c
	@@ -279,11 +279,11 @@
279	** --force-missing Force checkout even if content is missing
280	** --setmtime Set timestamps of all files to match their SCM-side
281	** times (the timestamp of the last checkin which modified
282	** them).
283	**
284	** See also: update
285	*/
286	void checkout_cmd(void){
287	int forceFlag; /* Force checkout even if edits exist */
288	int forceMissingFlag; /* Force checkout even if missing content */
289	int keepFlag; /* Do not change any files on disk */
	@@ -387,18 +387,18 @@
387	/*
388	** COMMAND: close*
389	**
390	** Usage: %fossil close ?OPTIONS?
391	**
392	** The opposite of "open". Close the current database connection.
393	** Require a -f or --force flag if there are unsaved changes in the
394	** current check-out or if there is non-empty stash.
395	**
396	** Options:
397	** --force\|-f necessary to close a check out with uncommitted changes
398	**
399	** See also: open
400	*/
401	void close_cmd(void){
402	int forceFlag = find_option("force","f",0)!=0;
403	db_must_be_within_tree();
404
405

	--- src/checkout.c
	+++ src/checkout.c
	@@ -279,11 +279,11 @@
279	** --force-missing Force checkout even if content is missing
280	** --setmtime Set timestamps of all files to match their SCM-side
281	** times (the timestamp of the last checkin which modified
282	** them).
283	**
284	** See also: [[update]]
285	*/
286	void checkout_cmd(void){
287	int forceFlag; /* Force checkout even if edits exist */
288	int forceMissingFlag; /* Force checkout even if missing content */
289	int keepFlag; /* Do not change any files on disk */
	@@ -387,18 +387,18 @@
387	/*
388	** COMMAND: close*
389	**
390	** Usage: %fossil close ?OPTIONS?
391	**
392	** The opposite of "[[open]]". Close the current database connection.
393	** Require a -f or --force flag if there are unsaved changes in the
394	** current check-out or if there is non-empty stash.
395	**
396	** Options:
397	** --force\|-f necessary to close a check out with uncommitted changes
398	**
399	** See also: [[open]]
400	*/
401	void close_cmd(void){
402	int forceFlag = find_option("force","f",0)!=0;
403	db_must_be_within_tree();
404
405

M src/configure.c

+1 -1

		--- src/configure.c
		+++ src/configure.c
		@@ -746,11 +746,11 @@
746	746	** the remote repository at URL.
747	747	**
748	748	** Options:
749	749	** -R\|--repository FILE Extract info from repository FILE
750	750	**
751		-** See also: settings, unset
	751	+** See also: [[settings]], [[unset]]
752	752	*/
753	753	void configuration_cmd(void){
754	754	int n;
755	755	const char *zMethod;
756	756	db_find_and_open_repository(0, 0);
757	757

	--- src/configure.c
	+++ src/configure.c
	@@ -746,11 +746,11 @@
746	** the remote repository at URL.
747	**
748	** Options:
749	** -R\|--repository FILE Extract info from repository FILE
750	**
751	** See also: settings, unset
752	*/
753	void configuration_cmd(void){
754	int n;
755	const char *zMethod;
756	db_find_and_open_repository(0, 0);
757

	--- src/configure.c
	+++ src/configure.c
	@@ -746,11 +746,11 @@
746	** the remote repository at URL.
747	**
748	** Options:
749	** -R\|--repository FILE Extract info from repository FILE
750	**
751	** See also: [[settings]], [[unset]]
752	*/
753	void configuration_cmd(void){
754	int n;
755	const char *zMethod;
756	db_find_and_open_repository(0, 0);
757

M src/content.c

+1 -1

		--- src/content.c
		+++ src/content.c
		@@ -326,11 +326,11 @@
326	326	** the named output file.
327	327	**
328	328	** Options:
329	329	** -R\|--repository FILE Extract artifacts from repository FILE
330	330	**
331		-** See also: finfo
	331	+** See also: [[finfo]]
332	332	*/
333	333	void artifact_cmd(void){
334	334	int rid;
335	335	Blob content;
336	336	const char *zFile;
337	337

	--- src/content.c
	+++ src/content.c
	@@ -326,11 +326,11 @@
326	** the named output file.
327	**
328	** Options:
329	** -R\|--repository FILE Extract artifacts from repository FILE
330	**
331	** See also: finfo
332	*/
333	void artifact_cmd(void){
334	int rid;
335	Blob content;
336	const char *zFile;
337

	--- src/content.c
	+++ src/content.c
	@@ -326,11 +326,11 @@
326	** the named output file.
327	**
328	** Options:
329	** -R\|--repository FILE Extract artifacts from repository FILE
330	**
331	** See also: [[finfo]]
332	*/
333	void artifact_cmd(void){
334	int rid;
335	Blob content;
336	const char *zFile;
337

M src/db.c

+10 -11

		--- src/db.c
		+++ src/db.c
		@@ -3089,39 +3089,38 @@
3089	3089	** check-in on the main branch (usually "trunk") is used.
3090	3090	**
3091	3091	** REPOSITORY can be the filename for a repository that already exists on the
3092	3092	** local machine or it can be a URI for a remote repository. If REPOSITORY
3093	3093	** is a URI in one of the formats recognized by the [[clone]] command, then
3094		-** remote repo is first cloned, then the clone is opened.
3095		-** The clone will be stored in the current directory, or in an alternative
3096		-** directory specified by the --repodir option. The name of the clone will
3097		-** be taken from the last term of the URI. For http: and https: URIs, you
3098		-** can append an extra term on the end to get any repository name you like.
3099		-** For example:
	3094	+** remote repo is first cloned, then the clone is opened. The clone will be
	3095	+** stored in the current directory, or in DIR if the "--workdir DIR" option
	3096	+** is used. The name of the clone will be taken from the last term of the URI.
	3097	+** For "http:" and "https:" URIs, you can append an extra term on the end to
	3098	+** get any repository name you like. For example:
3100	3099	**
3101	3100	** fossil open https://fossil-scm.org/home/new-name
3102	3101	**
3103		-** The base URI for cloning is 'https://fossil-scm.org/home'. The extra
3104		-** 'new-name' term means that the cloned repository will be called
3105		-** 'new-name.fossil'.
	3102	+** The base URI for cloning is "https://fossil-scm.org/home". The extra
	3103	+** "new-name" term means that the cloned repository will be called
	3104	+** "new-name.fossil".
3106	3105	**
3107	3106	** Options:
3108	3107	** --empty Initialize checkout as being empty, but still connected
3109	3108	** with the local repository. If you commit this checkout,
3110	3109	** it will become a new "initial" commit in the repository.
3111	3110	** --force Continue with the open even if the working directory is
3112		-** not empy.
	3111	+** not empty.
3113	3112	** --force-missing Force opening a repository with missing content
3114	3113	** --keep Only modify the manifest and manifest.uuid files
3115	3114	** --nested Allow opening a repository inside an opened checkout
3116	3115	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
3117	3116	** the clone in DIR rather than in "."
3118	3117	** --setmtime Set timestamps of all files to match their SCM-side
3119	3118	** times (the timestamp of the last checkin which modified
3120	3119	** them).
3121	3120	** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3122		-** directory is created if it does not previously exist.
	3121	+** directory is created if it does not exist.
3123	3122	**
3124	3123	** See also: [[close]], [[clone]]
3125	3124	*/
3126	3125	void cmd_open(void){
3127	3126	int emptyFlag;
3128	3127

	--- src/db.c
	+++ src/db.c
	@@ -3089,39 +3089,38 @@
3089	** check-in on the main branch (usually "trunk") is used.
3090	**
3091	** REPOSITORY can be the filename for a repository that already exists on the
3092	** local machine or it can be a URI for a remote repository. If REPOSITORY
3093	** is a URI in one of the formats recognized by the [[clone]] command, then
3094	** remote repo is first cloned, then the clone is opened.
3095	** The clone will be stored in the current directory, or in an alternative
3096	** directory specified by the --repodir option. The name of the clone will
3097	** be taken from the last term of the URI. For http: and https: URIs, you
3098	** can append an extra term on the end to get any repository name you like.
3099	** For example:
3100	**
3101	** fossil open https://fossil-scm.org/home/new-name
3102	**
3103	** The base URI for cloning is 'https://fossil-scm.org/home'. The extra
3104	** 'new-name' term means that the cloned repository will be called
3105	** 'new-name.fossil'.
3106	**
3107	** Options:
3108	** --empty Initialize checkout as being empty, but still connected
3109	** with the local repository. If you commit this checkout,
3110	** it will become a new "initial" commit in the repository.
3111	** --force Continue with the open even if the working directory is
3112	** not empy.
3113	** --force-missing Force opening a repository with missing content
3114	** --keep Only modify the manifest and manifest.uuid files
3115	** --nested Allow opening a repository inside an opened checkout
3116	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
3117	** the clone in DIR rather than in "."
3118	** --setmtime Set timestamps of all files to match their SCM-side
3119	** times (the timestamp of the last checkin which modified
3120	** them).
3121	** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3122	** directory is created if it does not previously exist.
3123	**
3124	** See also: [[close]], [[clone]]
3125	*/
3126	void cmd_open(void){
3127	int emptyFlag;
3128

	--- src/db.c
	+++ src/db.c
	@@ -3089,39 +3089,38 @@
3089	** check-in on the main branch (usually "trunk") is used.
3090	**
3091	** REPOSITORY can be the filename for a repository that already exists on the
3092	** local machine or it can be a URI for a remote repository. If REPOSITORY
3093	** is a URI in one of the formats recognized by the [[clone]] command, then
3094	** remote repo is first cloned, then the clone is opened. The clone will be
3095	** stored in the current directory, or in DIR if the "--workdir DIR" option
3096	** is used. The name of the clone will be taken from the last term of the URI.
3097	** For "http:" and "https:" URIs, you can append an extra term on the end to
3098	** get any repository name you like. For example:

3099	**
3100	** fossil open https://fossil-scm.org/home/new-name
3101	**
3102	** The base URI for cloning is "https://fossil-scm.org/home". The extra
3103	** "new-name" term means that the cloned repository will be called
3104	** "new-name.fossil".
3105	**
3106	** Options:
3107	** --empty Initialize checkout as being empty, but still connected
3108	** with the local repository. If you commit this checkout,
3109	** it will become a new "initial" commit in the repository.
3110	** --force Continue with the open even if the working directory is
3111	** not empty.
3112	** --force-missing Force opening a repository with missing content
3113	** --keep Only modify the manifest and manifest.uuid files
3114	** --nested Allow opening a repository inside an opened checkout
3115	** --repodir DIR If REPOSITORY is a URI that will be cloned, store
3116	** the clone in DIR rather than in "."
3117	** --setmtime Set timestamps of all files to match their SCM-side
3118	** times (the timestamp of the last checkin which modified
3119	** them).
3120	** --workdir DIR Use DIR as the working directory instead of ".". The DIR
3121	** directory is created if it does not exist.
3122	**
3123	** See also: [[close]], [[clone]]
3124	*/
3125	void cmd_open(void){
3126	int emptyFlag;
3127

M src/descendants.c

+2 -2

		--- src/descendants.c
		+++ src/descendants.c
		@@ -348,11 +348,11 @@
348	348	** -R\|--repository FILE Extract info from repository FILE
349	349	** -W\|--width <num> Width of lines (default is to auto-detect).
350	350	** Must be >20 or 0 (= no limit, resulting in a
351	351	** single line per entry).
352	352	**
353		-** See also: finfo, info, leaves
	353	+** See also: [[finfo]], [[info]], [[leaves]]
354	354	*/
355	355	void descendants_cmd(void){
356	356	Stmt q;
357	357	int base, width;
358	358	const char *zWidth;
		@@ -408,11 +408,11 @@
408	408	** --recompute recompute the "leaf" table in the repository DB
409	409	** -W\|--width <num> Width of lines (default is to auto-detect). Must be
410	410	** >39 or 0 (= no limit, resulting in a single line per
411	411	** entry).
412	412	**
413		-** See also: descendants, finfo, info, branch
	413	+** See also: [[descendants]], [[finfo]], [[info]], [[branch]]
414	414	*/
415	415	void leaves_cmd(void){
416	416	Stmt q;
417	417	Blob sql;
418	418	int showAll = find_option("all", "a", 0)!=0;
419	419

	--- src/descendants.c
	+++ src/descendants.c
	@@ -348,11 +348,11 @@
348	** -R\|--repository FILE Extract info from repository FILE
349	** -W\|--width <num> Width of lines (default is to auto-detect).
350	** Must be >20 or 0 (= no limit, resulting in a
351	** single line per entry).
352	**
353	** See also: finfo, info, leaves
354	*/
355	void descendants_cmd(void){
356	Stmt q;
357	int base, width;
358	const char *zWidth;
	@@ -408,11 +408,11 @@
408	** --recompute recompute the "leaf" table in the repository DB
409	** -W\|--width <num> Width of lines (default is to auto-detect). Must be
410	** >39 or 0 (= no limit, resulting in a single line per
411	** entry).
412	**
413	** See also: descendants, finfo, info, branch
414	*/
415	void leaves_cmd(void){
416	Stmt q;
417	Blob sql;
418	int showAll = find_option("all", "a", 0)!=0;
419

	--- src/descendants.c
	+++ src/descendants.c
	@@ -348,11 +348,11 @@
348	** -R\|--repository FILE Extract info from repository FILE
349	** -W\|--width <num> Width of lines (default is to auto-detect).
350	** Must be >20 or 0 (= no limit, resulting in a
351	** single line per entry).
352	**
353	** See also: [[finfo]], [[info]], [[leaves]]
354	*/
355	void descendants_cmd(void){
356	Stmt q;
357	int base, width;
358	const char *zWidth;
	@@ -408,11 +408,11 @@
408	** --recompute recompute the "leaf" table in the repository DB
409	** -W\|--width <num> Width of lines (default is to auto-detect). Must be
410	** >39 or 0 (= no limit, resulting in a single line per
411	** entry).
412	**
413	** See also: [[descendants]], [[finfo]], [[info]], [[branch]]
414	*/
415	void leaves_cmd(void){
416	Stmt q;
417	Blob sql;
418	int showAll = find_option("all", "a", 0)!=0;
419

M src/diff.c

+1 -1

		--- src/diff.c
		+++ src/diff.c
		@@ -2596,11 +2596,11 @@
2596	2596	** root of the repository. Set to "trunk" or
2597	2597	** similar for a reverse annotation.
2598	2598	** -w\|--ignore-all-space Ignore white space when comparing lines
2599	2599	** -Z\|--ignore-trailing-space Ignore whitespace at line end
2600	2600	**
2601		-** See also: info, finfo, timeline
	2601	+** See also: [[info]], [[finfo]], [[timeline]]
2602	2602	*/
2603	2603	void annotate_cmd(void){
2604	2604	const char zRevision; / Revision name, or NULL for current check-in */
2605	2605	Annotator ann; /* The annotation of the file */
2606	2606	int i; /* Loop counter */
2607	2607

	--- src/diff.c
	+++ src/diff.c
	@@ -2596,11 +2596,11 @@
2596	** root of the repository. Set to "trunk" or
2597	** similar for a reverse annotation.
2598	** -w\|--ignore-all-space Ignore white space when comparing lines
2599	** -Z\|--ignore-trailing-space Ignore whitespace at line end
2600	**
2601	** See also: info, finfo, timeline
2602	*/
2603	void annotate_cmd(void){
2604	const char zRevision; / Revision name, or NULL for current check-in */
2605	Annotator ann; /* The annotation of the file */
2606	int i; /* Loop counter */
2607

	--- src/diff.c
	+++ src/diff.c
	@@ -2596,11 +2596,11 @@
2596	** root of the repository. Set to "trunk" or
2597	** similar for a reverse annotation.
2598	** -w\|--ignore-all-space Ignore white space when comparing lines
2599	** -Z\|--ignore-trailing-space Ignore whitespace at line end
2600	**
2601	** See also: [[info]], [[finfo]], [[timeline]]
2602	*/
2603	void annotate_cmd(void){
2604	const char zRevision; / Revision name, or NULL for current check-in */
2605	Annotator ann; /* The annotation of the file */
2606	int i; /* Loop counter */
2607

M src/finfo.c

+2 -2

		--- src/finfo.c
		+++ src/finfo.c
		@@ -54,11 +54,11 @@
54	54	** -s\|--status select status mode (print a status indicator for FILE)
55	55	** -W\|--width <num> Width of lines (default is to auto-detect). Must be
56	56	** >22 or 0 (= no limit, resulting in a single line per
57	57	** entry).
58	58	**
59		-** See also: artifact, cat, descendants, info, leaves
	59	+** See also: [[artifact]], [[cat]], [[descendants]], [[info]], [[leaves]]
60	60	*/
61	61	void finfo_cmd(void){
62	62	db_must_be_within_tree();
63	63	if( find_option("status","s",0) ){
64	64	Stmt q;
		@@ -245,11 +245,11 @@
245	245	**
246	246	** Options:
247	247	** -R\|--repository FILE Extract artifacts from repository FILE
248	248	** -r VERSION The specific check-in containing the file
249	249	**
250		-** See also: finfo
	250	+** See also: [[finfo]]
251	251	*/
252	252	void cat_cmd(void){
253	253	int i;
254	254	Blob content, fname;
255	255	const char *zRev;
256	256

	--- src/finfo.c
	+++ src/finfo.c
	@@ -54,11 +54,11 @@
54	** -s\|--status select status mode (print a status indicator for FILE)
55	** -W\|--width <num> Width of lines (default is to auto-detect). Must be
56	** >22 or 0 (= no limit, resulting in a single line per
57	** entry).
58	**
59	** See also: artifact, cat, descendants, info, leaves
60	*/
61	void finfo_cmd(void){
62	db_must_be_within_tree();
63	if( find_option("status","s",0) ){
64	Stmt q;
	@@ -245,11 +245,11 @@
245	**
246	** Options:
247	** -R\|--repository FILE Extract artifacts from repository FILE
248	** -r VERSION The specific check-in containing the file
249	**
250	** See also: finfo
251	*/
252	void cat_cmd(void){
253	int i;
254	Blob content, fname;
255	const char *zRev;
256

	--- src/finfo.c
	+++ src/finfo.c
	@@ -54,11 +54,11 @@
54	** -s\|--status select status mode (print a status indicator for FILE)
55	** -W\|--width <num> Width of lines (default is to auto-detect). Must be
56	** >22 or 0 (= no limit, resulting in a single line per
57	** entry).
58	**
59	** See also: [[artifact]], [[cat]], [[descendants]], [[info]], [[leaves]]
60	*/
61	void finfo_cmd(void){
62	db_must_be_within_tree();
63	if( find_option("status","s",0) ){
64	Stmt q;
	@@ -245,11 +245,11 @@
245	**
246	** Options:
247	** -R\|--repository FILE Extract artifacts from repository FILE
248	** -r VERSION The specific check-in containing the file
249	**
250	** See also: [[finfo]]
251	*/
252	void cat_cmd(void){
253	int i;
254	Blob content, fname;
255	const char *zRev;
256

M src/info.c

+1 -1

		--- src/info.c
		+++ src/info.c
		@@ -191,11 +191,11 @@
191	191	** Options:
192	192	**
193	193	** -R\|--repository FILE Extract info from repository FILE
194	194	** -v\|--verbose Show extra information about repositories
195	195	**
196		-** See also: annotate, artifact, finfo, timeline
	196	+** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]]
197	197	*/
198	198	void info_cmd(void){
199	199	i64 fsize;
200	200	int verboseFlag = find_option("verbose","v",0)!=0;
201	201	if( !verboseFlag ){
202	202

	--- src/info.c
	+++ src/info.c
	@@ -191,11 +191,11 @@
191	** Options:
192	**
193	** -R\|--repository FILE Extract info from repository FILE
194	** -v\|--verbose Show extra information about repositories
195	**
196	** See also: annotate, artifact, finfo, timeline
197	*/
198	void info_cmd(void){
199	i64 fsize;
200	int verboseFlag = find_option("verbose","v",0)!=0;
201	if( !verboseFlag ){
202

	--- src/info.c
	+++ src/info.c
	@@ -191,11 +191,11 @@
191	** Options:
192	**
193	** -R\|--repository FILE Extract info from repository FILE
194	** -v\|--verbose Show extra information about repositories
195	**
196	** See also: [[annotate]], [[artifact]], [[finfo]], [[timeline]]
197	*/
198	void info_cmd(void){
199	i64 fsize;
200	int verboseFlag = find_option("verbose","v",0)!=0;
201	if( !verboseFlag ){
202

M src/main.c

+4 -4

		--- src/main.c
		+++ src/main.c
		@@ -2103,11 +2103,11 @@
2103	2103	** flag of the http command.
2104	2104	**
2105	2105	** Most CGI files contain only a "repository:" line. It is uncommon to
2106	2106	** use any other option.
2107	2107	**
2108		-** See also: http, server, winsrv
	2108	+** See also: [[http]], [[server]], [[winsrv]]
2109	2109	*/
2110	2110	void cmd_cgi(void){
2111	2111	const char *zFile;
2112	2112	const char *zNotFound = 0;
2113	2113	char *azRedirect = 0; / List of repositories to redirect to */
		@@ -2501,11 +2501,11 @@
2501	2501	** --skin LABEL Use override skin LABEL
2502	2502	** --th-trace trace TH1 execution (for debugging purposes)
2503	2503	** --usepidkey Use saved encryption key from parent process. This is
2504	2504	** only necessary when using SEE on Windows.
2505	2505	**
2506		-** See also: cgi, server, winsrv
	2506	+** See also: [[cgi]], [[server]], [[winsrv]]
2507	2507	*/
2508	2508	void cmd_http(void){
2509	2509	const char *zIpAddr = 0;
2510	2510	const char *zNotFound;
2511	2511	const char *zHost;
		@@ -2607,11 +2607,11 @@
2607	2607	/*
2608	2608	** Note that the following command is used by ssh:// processing.
2609	2609	**
2610	2610	** COMMAND: test-http
2611	2611	**
2612		-** Works like the http command but gives setup permission to all users.
	2612	+** Works like the [[http]] command but gives setup permission to all users.
2613	2613	**
2614	2614	** Options:
2615	2615	** --th-trace trace TH1 execution (for debugging purposes)
2616	2616	** --usercap CAP user capability string. (Default: "sx")
2617	2617	**
		@@ -2775,11 +2775,11 @@
2775	2775	** --scgi Accept SCGI rather than HTTP
2776	2776	** --skin LABEL Use override skin LABEL
2777	2777	** --usepidkey Use saved encryption key from parent process. This is
2778	2778	** only necessary when using SEE on Windows.
2779	2779	**
2780		-** See also: cgi, http, winsrv
	2780	+** See also: [[cgi]], [[http]], [[winsrv]]
2781	2781	*/
2782	2782	void cmd_webserver(void){
2783	2783	int iPort, mxPort; /* Range of TCP ports allowed */
2784	2784	const char zPort; / Value of the --port option */
2785	2785	const char zBrowser; / Name of web browser program */
2786	2786

	--- src/main.c
	+++ src/main.c
	@@ -2103,11 +2103,11 @@
2103	** flag of the http command.
2104	**
2105	** Most CGI files contain only a "repository:" line. It is uncommon to
2106	** use any other option.
2107	**
2108	** See also: http, server, winsrv
2109	*/
2110	void cmd_cgi(void){
2111	const char *zFile;
2112	const char *zNotFound = 0;
2113	char *azRedirect = 0; / List of repositories to redirect to */
	@@ -2501,11 +2501,11 @@
2501	** --skin LABEL Use override skin LABEL
2502	** --th-trace trace TH1 execution (for debugging purposes)
2503	** --usepidkey Use saved encryption key from parent process. This is
2504	** only necessary when using SEE on Windows.
2505	**
2506	** See also: cgi, server, winsrv
2507	*/
2508	void cmd_http(void){
2509	const char *zIpAddr = 0;
2510	const char *zNotFound;
2511	const char *zHost;
	@@ -2607,11 +2607,11 @@
2607	/*
2608	** Note that the following command is used by ssh:// processing.
2609	**
2610	** COMMAND: test-http
2611	**
2612	** Works like the http command but gives setup permission to all users.
2613	**
2614	** Options:
2615	** --th-trace trace TH1 execution (for debugging purposes)
2616	** --usercap CAP user capability string. (Default: "sx")
2617	**
	@@ -2775,11 +2775,11 @@
2775	** --scgi Accept SCGI rather than HTTP
2776	** --skin LABEL Use override skin LABEL
2777	** --usepidkey Use saved encryption key from parent process. This is
2778	** only necessary when using SEE on Windows.
2779	**
2780	** See also: cgi, http, winsrv
2781	*/
2782	void cmd_webserver(void){
2783	int iPort, mxPort; /* Range of TCP ports allowed */
2784	const char zPort; / Value of the --port option */
2785	const char zBrowser; / Name of web browser program */
2786

	--- src/main.c
	+++ src/main.c
	@@ -2103,11 +2103,11 @@
2103	** flag of the http command.
2104	**
2105	** Most CGI files contain only a "repository:" line. It is uncommon to
2106	** use any other option.
2107	**
2108	** See also: [[http]], [[server]], [[winsrv]]
2109	*/
2110	void cmd_cgi(void){
2111	const char *zFile;
2112	const char *zNotFound = 0;
2113	char *azRedirect = 0; / List of repositories to redirect to */
	@@ -2501,11 +2501,11 @@
2501	** --skin LABEL Use override skin LABEL
2502	** --th-trace trace TH1 execution (for debugging purposes)
2503	** --usepidkey Use saved encryption key from parent process. This is
2504	** only necessary when using SEE on Windows.
2505	**
2506	** See also: [[cgi]], [[server]], [[winsrv]]
2507	*/
2508	void cmd_http(void){
2509	const char *zIpAddr = 0;
2510	const char *zNotFound;
2511	const char *zHost;
	@@ -2607,11 +2607,11 @@
2607	/*
2608	** Note that the following command is used by ssh:// processing.
2609	**
2610	** COMMAND: test-http
2611	**
2612	** Works like the [[http]] command but gives setup permission to all users.
2613	**
2614	** Options:
2615	** --th-trace trace TH1 execution (for debugging purposes)
2616	** --usercap CAP user capability string. (Default: "sx")
2617	**
	@@ -2775,11 +2775,11 @@
2775	** --scgi Accept SCGI rather than HTTP
2776	** --skin LABEL Use override skin LABEL
2777	** --usepidkey Use saved encryption key from parent process. This is
2778	** only necessary when using SEE on Windows.
2779	**
2780	** See also: [[cgi]], [[http]], [[winsrv]]
2781	*/
2782	void cmd_webserver(void){
2783	int iPort, mxPort; /* Range of TCP ports allowed */
2784	const char zPort; / Value of the --port option */
2785	const char zBrowser; / Name of web browser program */
2786

M src/purge.c

-11

		--- src/purge.c
		+++ src/purge.c
		@@ -507,21 +507,10 @@
507	507	**
508	508	** COMMON OPTIONS:
509	509	**
510	510	** --explain Make no changes, but show what would happen.
511	511	** --dry-run An alias for --explain
512		-**
513		-** SUMMARY:
514		-** * fossil purge artifacts HASH.. [OPTIONS]
515		-** * fossil purge cat HASH...
516		-** * fossil purge checkins TAGS... [OPTIONS]
517		-** * fossil purge files FILENAME... [OPTIONS]
518		-** * fossil purge list
519		-** * fossil purge obliterate ID...
520		-** * fossil purge tickets NAME... [OPTIONS]
521		-** * fossil purge undo ID
522		-** * fossil purge wiki NAME... [OPTIONS]
523	512	*/
524	513	void purge_cmd(void){
525	514	int purgeFlags = PURGE_MOVETO_GRAVEYARD \| PURGE_PRINT_SUMMARY;
526	515	const char *zSubcmd;
527	516	int n;
528	517

	--- src/purge.c
	+++ src/purge.c
	@@ -507,21 +507,10 @@
507	**
508	** COMMON OPTIONS:
509	**
510	** --explain Make no changes, but show what would happen.
511	** --dry-run An alias for --explain
512	**
513	** SUMMARY:
514	** * fossil purge artifacts HASH.. [OPTIONS]
515	** * fossil purge cat HASH...
516	** * fossil purge checkins TAGS... [OPTIONS]
517	** * fossil purge files FILENAME... [OPTIONS]
518	** * fossil purge list
519	** * fossil purge obliterate ID...
520	** * fossil purge tickets NAME... [OPTIONS]
521	** * fossil purge undo ID
522	** * fossil purge wiki NAME... [OPTIONS]
523	*/
524	void purge_cmd(void){
525	int purgeFlags = PURGE_MOVETO_GRAVEYARD \| PURGE_PRINT_SUMMARY;
526	const char *zSubcmd;
527	int n;
528

	--- src/purge.c
	+++ src/purge.c
	@@ -507,21 +507,10 @@
507	**
508	** COMMON OPTIONS:
509	**
510	** --explain Make no changes, but show what would happen.
511	** --dry-run An alias for --explain











512	*/
513	void purge_cmd(void){
514	int purgeFlags = PURGE_MOVETO_GRAVEYARD \| PURGE_PRINT_SUMMARY;
515	const char *zSubcmd;
516	int n;
517

M src/rebuild.c

-6

		--- src/rebuild.c
		+++ src/rebuild.c
		@@ -601,12 +601,10 @@
601	601	** --quiet Only show output if there are errors
602	602	** --randomize Scan artifacts in a random order
603	603	** --stats Show artifact statistics after rebuilding
604	604	** --vacuum Run VACUUM on the database after rebuilding
605	605	** --wal Set Write-Ahead-Log journalling mode on the database
606		-**
607		-** See also: deconstruct, reconstruct
608	606	*/
609	607	void rebuild_database(void){
610	608	int forceFlag;
611	609	int randomizeFlag;
612	610	int errCnt = 0;
		@@ -1205,12 +1203,10 @@
1205	1203	** Options:
1206	1204	** -K\|--keep-rid1 Read the filename of the artifact with RID=1 from the
1207	1205	** file .rid in DIRECTORY.
1208	1206	** -P\|--keep-private Mark the artifacts listed in the file .private in
1209	1207	** DIRECTORY as private in the new Fossil repository.
1210		-**
1211		-** See also: deconstruct, rebuild
1212	1208	*/
1213	1209	void reconstruct_cmd(void) {
1214	1210	char *zPassword;
1215	1211	int fKeepPrivate;
1216	1212	fKeepRid1 = find_option("keep-rid1","K",0)!=0;
		@@ -1280,12 +1276,10 @@
1280	1276	** subdirectories to N.
1281	1277	** --private Include private artifacts.
1282	1278	** -P\|--keep-private Save the list of private artifacts to the file
1283	1279	** .private in the DESTINATION directory (implies
1284	1280	** the --private option).
1285		-**
1286		-** See also: reconstruct, rebuild
1287	1281	*/
1288	1282	void deconstruct_cmd(void){
1289	1283	const char *zPrefixOpt;
1290	1284	Stmt s;
1291	1285	int privateFlag;
1292	1286

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -601,12 +601,10 @@
601	** --quiet Only show output if there are errors
602	** --randomize Scan artifacts in a random order
603	** --stats Show artifact statistics after rebuilding
604	** --vacuum Run VACUUM on the database after rebuilding
605	** --wal Set Write-Ahead-Log journalling mode on the database
606	**
607	** See also: deconstruct, reconstruct
608	*/
609	void rebuild_database(void){
610	int forceFlag;
611	int randomizeFlag;
612	int errCnt = 0;
	@@ -1205,12 +1203,10 @@
1205	** Options:
1206	** -K\|--keep-rid1 Read the filename of the artifact with RID=1 from the
1207	** file .rid in DIRECTORY.
1208	** -P\|--keep-private Mark the artifacts listed in the file .private in
1209	** DIRECTORY as private in the new Fossil repository.
1210	**
1211	** See also: deconstruct, rebuild
1212	*/
1213	void reconstruct_cmd(void) {
1214	char *zPassword;
1215	int fKeepPrivate;
1216	fKeepRid1 = find_option("keep-rid1","K",0)!=0;
	@@ -1280,12 +1276,10 @@
1280	** subdirectories to N.
1281	** --private Include private artifacts.
1282	** -P\|--keep-private Save the list of private artifacts to the file
1283	** .private in the DESTINATION directory (implies
1284	** the --private option).
1285	**
1286	** See also: reconstruct, rebuild
1287	*/
1288	void deconstruct_cmd(void){
1289	const char *zPrefixOpt;
1290	Stmt s;
1291	int privateFlag;
1292

	--- src/rebuild.c
	+++ src/rebuild.c
	@@ -601,12 +601,10 @@
601	** --quiet Only show output if there are errors
602	** --randomize Scan artifacts in a random order
603	** --stats Show artifact statistics after rebuilding
604	** --vacuum Run VACUUM on the database after rebuilding
605	** --wal Set Write-Ahead-Log journalling mode on the database


606	*/
607	void rebuild_database(void){
608	int forceFlag;
609	int randomizeFlag;
610	int errCnt = 0;
	@@ -1205,12 +1203,10 @@
1203	** Options:
1204	** -K\|--keep-rid1 Read the filename of the artifact with RID=1 from the
1205	** file .rid in DIRECTORY.
1206	** -P\|--keep-private Mark the artifacts listed in the file .private in
1207	** DIRECTORY as private in the new Fossil repository.


1208	*/
1209	void reconstruct_cmd(void) {
1210	char *zPassword;
1211	int fKeepPrivate;
1212	fKeepRid1 = find_option("keep-rid1","K",0)!=0;
	@@ -1280,12 +1276,10 @@
1276	** subdirectories to N.
1277	** --private Include private artifacts.
1278	** -P\|--keep-private Save the list of private artifacts to the file
1279	** .private in the DESTINATION directory (implies
1280	** the --private option).


1281	*/
1282	void deconstruct_cmd(void){
1283	const char *zPrefixOpt;
1284	Stmt s;
1285	int privateFlag;
1286

M src/sha1.c

+2

		--- src/sha1.c
		+++ src/sha1.c
		@@ -507,10 +507,12 @@
507	507	**
508	508	** -h, --dereference If FILE is a symbolic link, compute the hash
509	509	** on the object that the link points to. Normally,
510	510	** the hash is over the name of the object that
511	511	** the link points to.
	512	+**
	513	+** See also: [[md5sum]], [[sha3sum]]
512	514	*/
513	515	void sha1sum_test(void){
514	516	int i;
515	517	Blob in;
516	518	Blob cksum;
517	519

	--- src/sha1.c
	+++ src/sha1.c
	@@ -507,10 +507,12 @@
507	**
508	** -h, --dereference If FILE is a symbolic link, compute the hash
509	** on the object that the link points to. Normally,
510	** the hash is over the name of the object that
511	** the link points to.


512	*/
513	void sha1sum_test(void){
514	int i;
515	Blob in;
516	Blob cksum;
517

	--- src/sha1.c
	+++ src/sha1.c
	@@ -507,10 +507,12 @@
507	**
508	** -h, --dereference If FILE is a symbolic link, compute the hash
509	** on the object that the link points to. Normally,
510	** the hash is over the name of the object that
511	** the link points to.
512	**
513	** See also: [[md5sum]], [[sha3sum]]
514	*/
515	void sha1sum_test(void){
516	int i;
517	Blob in;
518	Blob cksum;
519

M src/sha3.c

+2

		--- src/sha3.c
		+++ src/sha3.c
		@@ -637,10 +637,12 @@
637	637	** --512 Compute a SHA3-512 hash
638	638	** --size N An N-bit hash. N must be a multiple of 32 between
639	639	** 128 and 512.
640	640	** -h, --dereference If FILE is a symbolic link, compute the hash on
641	641	** the object pointed to, not on the link itself.
	642	+**
	643	+** See also: [[md5sum]], [[sha1sum]]
642	644	*/
643	645	void sha3sum_test(void){
644	646	int i;
645	647	Blob in;
646	648	Blob cksum;
647	649

	--- src/sha3.c
	+++ src/sha3.c
	@@ -637,10 +637,12 @@
637	** --512 Compute a SHA3-512 hash
638	** --size N An N-bit hash. N must be a multiple of 32 between
639	** 128 and 512.
640	** -h, --dereference If FILE is a symbolic link, compute the hash on
641	** the object pointed to, not on the link itself.


642	*/
643	void sha3sum_test(void){
644	int i;
645	Blob in;
646	Blob cksum;
647

	--- src/sha3.c
	+++ src/sha3.c
	@@ -637,10 +637,12 @@
637	** --512 Compute a SHA3-512 hash
638	** --size N An N-bit hash. N must be a multiple of 32 between
639	** 128 and 512.
640	** -h, --dereference If FILE is a symbolic link, compute the hash on
641	** the object pointed to, not on the link itself.
642	**
643	** See also: [[md5sum]], [[sha1sum]]
644	*/
645	void sha3sum_test(void){
646	int i;
647	Blob in;
648	Blob cksum;
649

M src/stash.c

-13

		--- src/stash.c
		+++ src/stash.c
		@@ -559,23 +559,10 @@
559	559	** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
560	560	**
561	561	** Show diffs of the current working directory and what that
562	562	** directory would be if STASHID were applied. With gdiff,
563	563	** gdiff-command is used instead of internal diff logic.
564		-**
565		-** SUMMARY:
566		-** * fossil stash
567		-** * fossil stash save ?-m\|--comment COMMENT? ?FILES...?
568		-** * fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
569		-** * fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
570		-** * fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
571		-** * fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
572		-** * fossil stash pop
573		-** * fossil stash apply\|goto ?STASHID?
574		-** * fossil stash drop\|rm ?STASHID? ?-a\|--all?
575		-** * fossil stash diff ?STASHID? ?DIFF-OPTIONS?
576		-** * fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
577	564	*/
578	565	void stash_cmd(void){
579	566	const char *zCmd;
580	567	int nCmd;
581	568	int stashid = 0;
582	569

	--- src/stash.c
	+++ src/stash.c
	@@ -559,23 +559,10 @@
559	** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
560	**
561	** Show diffs of the current working directory and what that
562	** directory would be if STASHID were applied. With gdiff,
563	** gdiff-command is used instead of internal diff logic.
564	**
565	** SUMMARY:
566	** * fossil stash
567	** * fossil stash save ?-m\|--comment COMMENT? ?FILES...?
568	** * fossil stash snapshot ?-m\|--comment COMMENT? ?FILES...?
569	** * fossil stash list\|ls ?-v\|--verbose? ?-W\|--width <num>?
570	** * fossil stash show\|cat ?STASHID? ?DIFF-OPTIONS?
571	** * fossil stash gshow\|gcat ?STASHID? ?DIFF-OPTIONS?
572	** * fossil stash pop
573	** * fossil stash apply\|goto ?STASHID?
574	** * fossil stash drop\|rm ?STASHID? ?-a\|--all?
575	** * fossil stash diff ?STASHID? ?DIFF-OPTIONS?
576	** * fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
577	*/
578	void stash_cmd(void){
579	const char *zCmd;
580	int nCmd;
581	int stashid = 0;
582

	--- src/stash.c
	+++ src/stash.c
	@@ -559,23 +559,10 @@
559	** > fossil stash gdiff ?STASHID? ?DIFF-OPTIONS?
560	**
561	** Show diffs of the current working directory and what that
562	** directory would be if STASHID were applied. With gdiff,
563	** gdiff-command is used instead of internal diff logic.













564	*/
565	void stash_cmd(void){
566	const char *zCmd;
567	int nCmd;
568	int stashid = 0;
569

M src/sync.c

+3 -3

		--- src/sync.c
		+++ src/sync.c
		@@ -217,11 +217,11 @@
217	217	** --ssh-command SSH Use SSH as the "ssh" command
218	218	** -v\|--verbose Additional (debugging) output
219	219	** --verily Exchange extra information with the remote
220	220	** to ensure no content is overlooked
221	221	**
222		-** See also: clone, config pull, push, remote, sync
	222	+** See also: [[clone]], [[configure]], [[push]], [[remote-url]], [[sync]]
223	223	*/
224	224	void pull_cmd(void){
225	225	unsigned configFlags = 0;
226	226	unsigned syncFlags = SYNC_PULL;
227	227	unsigned urlOmitFlags = 0;
		@@ -266,11 +266,11 @@
266	266	** --ssh-command SSH Use SSH as the "ssh" command
267	267	** -v\|--verbose Additional (debugging) output
268	268	** --verily Exchange extra information with the remote
269	269	** to ensure no content is overlooked
270	270	**
271		-** See also: clone, config push, pull, remote, sync
	271	+** See also: [[clone]], [[configure]], [[pull]], [[remote-url]], [[sync]]
272	272	*/
273	273	void push_cmd(void){
274	274	unsigned configFlags = 0;
275	275	unsigned syncFlags = SYNC_PUSH;
276	276	process_sync_args(&configFlags, &syncFlags, 0, 0);
		@@ -312,11 +312,11 @@
312	312	** -u\|--unversioned Also sync unversioned content
313	313	** -v\|--verbose Additional (debugging) output
314	314	** --verily Exchange extra information with the remote
315	315	** to ensure no content is overlooked
316	316	**
317		-** See also: clone, pull, push, remote
	317	+** See also: [[clone]], [[pull]], [[push]], [[remote]]
318	318	*/
319	319	void sync_cmd(void){
320	320	unsigned configFlags = 0;
321	321	unsigned syncFlags = SYNC_PUSH\|SYNC_PULL;
322	322	if( find_option("unversioned","u",0)!=0 ){
323	323

	--- src/sync.c
	+++ src/sync.c
	@@ -217,11 +217,11 @@
217	** --ssh-command SSH Use SSH as the "ssh" command
218	** -v\|--verbose Additional (debugging) output
219	** --verily Exchange extra information with the remote
220	** to ensure no content is overlooked
221	**
222	** See also: clone, config pull, push, remote, sync
223	*/
224	void pull_cmd(void){
225	unsigned configFlags = 0;
226	unsigned syncFlags = SYNC_PULL;
227	unsigned urlOmitFlags = 0;
	@@ -266,11 +266,11 @@
266	** --ssh-command SSH Use SSH as the "ssh" command
267	** -v\|--verbose Additional (debugging) output
268	** --verily Exchange extra information with the remote
269	** to ensure no content is overlooked
270	**
271	** See also: clone, config push, pull, remote, sync
272	*/
273	void push_cmd(void){
274	unsigned configFlags = 0;
275	unsigned syncFlags = SYNC_PUSH;
276	process_sync_args(&configFlags, &syncFlags, 0, 0);
	@@ -312,11 +312,11 @@
312	** -u\|--unversioned Also sync unversioned content
313	** -v\|--verbose Additional (debugging) output
314	** --verily Exchange extra information with the remote
315	** to ensure no content is overlooked
316	**
317	** See also: clone, pull, push, remote
318	*/
319	void sync_cmd(void){
320	unsigned configFlags = 0;
321	unsigned syncFlags = SYNC_PUSH\|SYNC_PULL;
322	if( find_option("unversioned","u",0)!=0 ){
323

	--- src/sync.c
	+++ src/sync.c
	@@ -217,11 +217,11 @@
217	** --ssh-command SSH Use SSH as the "ssh" command
218	** -v\|--verbose Additional (debugging) output
219	** --verily Exchange extra information with the remote
220	** to ensure no content is overlooked
221	**
222	** See also: [[clone]], [[configure]], [[push]], [[remote-url]], [[sync]]
223	*/
224	void pull_cmd(void){
225	unsigned configFlags = 0;
226	unsigned syncFlags = SYNC_PULL;
227	unsigned urlOmitFlags = 0;
	@@ -266,11 +266,11 @@
266	** --ssh-command SSH Use SSH as the "ssh" command
267	** -v\|--verbose Additional (debugging) output
268	** --verily Exchange extra information with the remote
269	** to ensure no content is overlooked
270	**
271	** See also: [[clone]], [[configure]], [[pull]], [[remote-url]], [[sync]]
272	*/
273	void push_cmd(void){
274	unsigned configFlags = 0;
275	unsigned syncFlags = SYNC_PUSH;
276	process_sync_args(&configFlags, &syncFlags, 0, 0);
	@@ -312,11 +312,11 @@
312	** -u\|--unversioned Also sync unversioned content
313	** -v\|--verbose Additional (debugging) output
314	** --verily Exchange extra information with the remote
315	** to ensure no content is overlooked
316	**
317	** See also: [[clone]], [[pull]], [[push]], [[remote]]
318	*/
319	void sync_cmd(void){
320	unsigned configFlags = 0;
321	unsigned syncFlags = SYNC_PUSH\|SYNC_PULL;
322	if( find_option("unversioned","u",0)!=0 ){
323

M src/undo.c

+1 -1

		--- src/undo.c
		+++ src/undo.c
		@@ -462,11 +462,11 @@
462	462	** that are undoable.
463	463	**
464	464	** Options:
465	465	** -n\|--dry-run do not make changes but show what would be done
466	466	**
467		-** See also: commit, status
	467	+** See also: [[commit]], [[status]]
468	468	*/
469	469	void undo_cmd(void){
470	470	int isRedo = g.argv[1][0]=='r';
471	471	int undo_available;
472	472	int dryRunFlag = find_option("dry-run", "n", 0)!=0;
473	473

	--- src/undo.c
	+++ src/undo.c
	@@ -462,11 +462,11 @@
462	** that are undoable.
463	**
464	** Options:
465	** -n\|--dry-run do not make changes but show what would be done
466	**
467	** See also: commit, status
468	*/
469	void undo_cmd(void){
470	int isRedo = g.argv[1][0]=='r';
471	int undo_available;
472	int dryRunFlag = find_option("dry-run", "n", 0)!=0;
473

	--- src/undo.c
	+++ src/undo.c
	@@ -462,11 +462,11 @@
462	** that are undoable.
463	**
464	** Options:
465	** -n\|--dry-run do not make changes but show what would be done
466	**
467	** See also: [[commit]], [[status]]
468	*/
469	void undo_cmd(void){
470	int isRedo = g.argv[1][0]=='r';
471	int undo_available;
472	int dryRunFlag = find_option("dry-run", "n", 0)!=0;
473

M src/update.c

+2 -2

		--- src/update.c
		+++ src/update.c
		@@ -108,11 +108,11 @@
108	108	** checkin which modified them).
109	109	** -K\|--keep-merge-files On merge conflict, retain the temporary files
110	110	** used for merging, named -baseline, -original,
111	111	** and *-merge.
112	112	**
113		-** See also: revert
	113	+** See also: [[revert]]
114	114	*/
115	115	void update_cmd(void){
116	116	int vid; /* Current version */
117	117	int tid=0; /* Target version - version we are changing to */
118	118	Stmt q;
		@@ -786,11 +786,11 @@
786	786	**
787	787	** Options:
788	788	** -r\|--revision VERSION Revert given FILE(s) back to given
789	789	** VERSION
790	790	**
791		-** See also: redo, undo, checkout, update
	791	+** See also: [[redo]], [[undo]], [[checkout]], [[update]]
792	792	*/
793	793	void revert_cmd(void){
794	794	Manifest pCoManifest; / Manifest of current checkout */
795	795	Manifest pRvManifest; / Manifest of selected revert version */
796	796	ManifestFile pCoFile; / File within current checkout manifest */
797	797

	--- src/update.c
	+++ src/update.c
	@@ -108,11 +108,11 @@
108	** checkin which modified them).
109	** -K\|--keep-merge-files On merge conflict, retain the temporary files
110	** used for merging, named -baseline, -original,
111	** and *-merge.
112	**
113	** See also: revert
114	*/
115	void update_cmd(void){
116	int vid; /* Current version */
117	int tid=0; /* Target version - version we are changing to */
118	Stmt q;
	@@ -786,11 +786,11 @@
786	**
787	** Options:
788	** -r\|--revision VERSION Revert given FILE(s) back to given
789	** VERSION
790	**
791	** See also: redo, undo, checkout, update
792	*/
793	void revert_cmd(void){
794	Manifest pCoManifest; / Manifest of current checkout */
795	Manifest pRvManifest; / Manifest of selected revert version */
796	ManifestFile pCoFile; / File within current checkout manifest */
797

	--- src/update.c
	+++ src/update.c
	@@ -108,11 +108,11 @@
108	** checkin which modified them).
109	** -K\|--keep-merge-files On merge conflict, retain the temporary files
110	** used for merging, named -baseline, -original,
111	** and *-merge.
112	**
113	** See also: [[revert]]
114	*/
115	void update_cmd(void){
116	int vid; /* Current version */
117	int tid=0; /* Target version - version we are changing to */
118	Stmt q;
	@@ -786,11 +786,11 @@
786	**
787	** Options:
788	** -r\|--revision VERSION Revert given FILE(s) back to given
789	** VERSION
790	**
791	** See also: [[redo]], [[undo]], [[checkout]], [[update]]
792	*/
793	void revert_cmd(void){
794	Manifest pCoManifest; / Manifest of current checkout */
795	Manifest pRvManifest; / Manifest of selected revert version */
796	ManifestFile pCoFile; / File within current checkout manifest */
797

Fossil SCM

Keyboard Shortcuts