Fossil SCM
Update the changes log. Fix a minor typo in the help text for "diff".
Commit
5839abaee4763400fc9989f49cd45b60b6580a86e9fd52f67c5a4112a40b7315
Parent
1033e0ff88f756d…
2 files changed
+1
-1
+8
+1
-1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -968,11 +968,11 @@ | ||
| 968 | 968 | ** base check-in for the current check-out. Similarly, the "--to VERSION" |
| 969 | 969 | ** option specifies the check-in from which the second version of the file |
| 970 | 970 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 971 | 971 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 972 | 972 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 973 | -** The "--branch BRANCHNAME" shows all then changes on the branch BRANCHNAME. | |
| 973 | +** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. | |
| 974 | 974 | ** |
| 975 | 975 | ** The "-i" command-line option forces the use of Fossils own the internal |
| 976 | 976 | ** diff logic rather than any external diff program that might be configured |
| 977 | 977 | ** using the "setting" command. If no external diff program is configured, |
| 978 | 978 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| 979 | 979 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -968,11 +968,11 @@ | |
| 968 | ** base check-in for the current check-out. Similarly, the "--to VERSION" |
| 969 | ** option specifies the check-in from which the second version of the file |
| 970 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 971 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 972 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 973 | ** The "--branch BRANCHNAME" shows all then changes on the branch BRANCHNAME. |
| 974 | ** |
| 975 | ** The "-i" command-line option forces the use of Fossils own the internal |
| 976 | ** diff logic rather than any external diff program that might be configured |
| 977 | ** using the "setting" command. If no external diff program is configured, |
| 978 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| 979 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -968,11 +968,11 @@ | |
| 968 | ** base check-in for the current check-out. Similarly, the "--to VERSION" |
| 969 | ** option specifies the check-in from which the second version of the file |
| 970 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 971 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 972 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 973 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 974 | ** |
| 975 | ** The "-i" command-line option forces the use of Fossils own the internal |
| 976 | ** diff logic rather than any external diff program that might be configured |
| 977 | ** using the "setting" command. If no external diff program is configured, |
| 978 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| 979 |
+8
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -4,10 +4,12 @@ | ||
| 4 | 4 | * Added new options to the various |
| 5 | 5 | [/help?cmd=diff|diff commands]: --by, -b, --webpage, --json, --tcl. |
| 6 | 6 | * Performance and display improvements to the internal diff engine, including |
| 7 | 7 | partial-line matching for unified diffs and improved partial line matching for |
| 8 | 8 | side-by-side diffs. |
| 9 | + * Buttons to increase the amount of context above or below each block of | |
| 10 | + differences are not shown on many web-based diff displays. | |
| 9 | 11 | * The --branchcolor option on [/help?cmd=commit|fossil commit] and |
| 10 | 12 | [/help?cmd=amend|fossil amend] can now take the value "auto" to |
| 11 | 13 | force Fossil to use its built-in automatic color choosing algorithm. |
| 12 | 14 | * Fossil now [./concepts.wiki#workflow|autosyncs] prior to running |
| 13 | 15 | [/help?cmd=open|fossil open]. |
| @@ -30,10 +32,16 @@ | ||
| 30 | 32 | block HTML markup (such as <table>) in most cases. Only content |
| 31 | 33 | of <pre> and <script> is passed through verbatim. |
| 32 | 34 | * The [/help?cmd=wiki|wiki list command] no longer lists "deleted" |
| 33 | 35 | pages by default. Use the new <tt>--all</tt> option to include deleted |
| 34 | 36 | pages in the output. |
| 37 | + * The [/help?cmd=all|fossil all git status] command only shows reports for | |
| 38 | + the subset of repositories that have a configured Git export. | |
| 39 | + * Added new subcommands to [/help?cmd=branch|fossil branch] including | |
| 40 | + "close", "hide", "reopen", and "unhide". | |
| 41 | + * The "-p" option to [/help?cmd=branch|fossil branch list] shows only | |
| 42 | + private branches. | |
| 35 | 43 | |
| 36 | 44 | <h2 id='v2_16'>Changes for Version 2.16 (2021-07-02)</h2> |
| 37 | 45 | * <b>Security:</b> Fix the client-side TLS so that it verifies that the |
| 38 | 46 | server hostname matches its certificate. |
| 39 | 47 | * The default "ssh" command on Windows is changed to "ssh" instead of the |
| 40 | 48 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -4,10 +4,12 @@ | |
| 4 | * Added new options to the various |
| 5 | [/help?cmd=diff|diff commands]: --by, -b, --webpage, --json, --tcl. |
| 6 | * Performance and display improvements to the internal diff engine, including |
| 7 | partial-line matching for unified diffs and improved partial line matching for |
| 8 | side-by-side diffs. |
| 9 | * The --branchcolor option on [/help?cmd=commit|fossil commit] and |
| 10 | [/help?cmd=amend|fossil amend] can now take the value "auto" to |
| 11 | force Fossil to use its built-in automatic color choosing algorithm. |
| 12 | * Fossil now [./concepts.wiki#workflow|autosyncs] prior to running |
| 13 | [/help?cmd=open|fossil open]. |
| @@ -30,10 +32,16 @@ | |
| 30 | block HTML markup (such as <table>) in most cases. Only content |
| 31 | of <pre> and <script> is passed through verbatim. |
| 32 | * The [/help?cmd=wiki|wiki list command] no longer lists "deleted" |
| 33 | pages by default. Use the new <tt>--all</tt> option to include deleted |
| 34 | pages in the output. |
| 35 | |
| 36 | <h2 id='v2_16'>Changes for Version 2.16 (2021-07-02)</h2> |
| 37 | * <b>Security:</b> Fix the client-side TLS so that it verifies that the |
| 38 | server hostname matches its certificate. |
| 39 | * The default "ssh" command on Windows is changed to "ssh" instead of the |
| 40 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -4,10 +4,12 @@ | |
| 4 | * Added new options to the various |
| 5 | [/help?cmd=diff|diff commands]: --by, -b, --webpage, --json, --tcl. |
| 6 | * Performance and display improvements to the internal diff engine, including |
| 7 | partial-line matching for unified diffs and improved partial line matching for |
| 8 | side-by-side diffs. |
| 9 | * Buttons to increase the amount of context above or below each block of |
| 10 | differences are not shown on many web-based diff displays. |
| 11 | * The --branchcolor option on [/help?cmd=commit|fossil commit] and |
| 12 | [/help?cmd=amend|fossil amend] can now take the value "auto" to |
| 13 | force Fossil to use its built-in automatic color choosing algorithm. |
| 14 | * Fossil now [./concepts.wiki#workflow|autosyncs] prior to running |
| 15 | [/help?cmd=open|fossil open]. |
| @@ -30,10 +32,16 @@ | |
| 32 | block HTML markup (such as <table>) in most cases. Only content |
| 33 | of <pre> and <script> is passed through verbatim. |
| 34 | * The [/help?cmd=wiki|wiki list command] no longer lists "deleted" |
| 35 | pages by default. Use the new <tt>--all</tt> option to include deleted |
| 36 | pages in the output. |
| 37 | * The [/help?cmd=all|fossil all git status] command only shows reports for |
| 38 | the subset of repositories that have a configured Git export. |
| 39 | * Added new subcommands to [/help?cmd=branch|fossil branch] including |
| 40 | "close", "hide", "reopen", and "unhide". |
| 41 | * The "-p" option to [/help?cmd=branch|fossil branch list] shows only |
| 42 | private branches. |
| 43 | |
| 44 | <h2 id='v2_16'>Changes for Version 2.16 (2021-07-02)</h2> |
| 45 | * <b>Security:</b> Fix the client-side TLS so that it verifies that the |
| 46 | server hostname matches its certificate. |
| 47 | * The default "ssh" command on Windows is changed to "ssh" instead of the |
| 48 |