Fossil SCM
Changed a few doc references from "fossil diff -N" to use -v instead, its anointed alternative.
Commit
ad42dfee58660c10ca33b07fa7c918f81de7bfe619dde4c4c265a35bcc4ce770
Parent
d1f74a367c73d92…
2 files changed
+3
-3
+2
-2
+3
-3
| --- www/checkin.wiki | ||
| +++ www/checkin.wiki | ||
| @@ -41,15 +41,15 @@ | ||
| 41 | 41 | within the project. Also remember to enable the localauth setting |
| 42 | 42 | if you intend to make changes via a locally served web UI. |
| 43 | 43 | |
| 44 | 44 | Item 1 is the most important step. Consider using <b>gdiff</b> |
| 45 | 45 | instead of <b>diff</b> if you have a graphical differ configured. Or |
| 46 | -use the command-line option <b>--tk</b>. Also consider the <b>-N</b> | |
| 47 | -command-line option to show the complete text newly added files. | |
| 46 | +use the command-line option <b>--tk</b>. Also consider the <b>-v</b> | |
| 47 | +command-line option to show the complete text of newly added files. | |
| 48 | 48 | The recommended command for completing checklist item 1 is: |
| 49 | 49 | |
| 50 | - <b>fossil diff --tk -N</b> | |
| 50 | + <b>fossil diff --tk -v</b> | |
| 51 | 51 | |
| 52 | 52 | Look carefully at every changed line in item 1. |
| 53 | 53 | Make sure that you are not about to commit unrelated changes. |
| 54 | 54 | If there are two or more unrelated changes present, consider |
| 55 | 55 | breaking up the commit into two or more separate commits. |
| 56 | 56 |
| --- www/checkin.wiki | |
| +++ www/checkin.wiki | |
| @@ -41,15 +41,15 @@ | |
| 41 | within the project. Also remember to enable the localauth setting |
| 42 | if you intend to make changes via a locally served web UI. |
| 43 | |
| 44 | Item 1 is the most important step. Consider using <b>gdiff</b> |
| 45 | instead of <b>diff</b> if you have a graphical differ configured. Or |
| 46 | use the command-line option <b>--tk</b>. Also consider the <b>-N</b> |
| 47 | command-line option to show the complete text newly added files. |
| 48 | The recommended command for completing checklist item 1 is: |
| 49 | |
| 50 | <b>fossil diff --tk -N</b> |
| 51 | |
| 52 | Look carefully at every changed line in item 1. |
| 53 | Make sure that you are not about to commit unrelated changes. |
| 54 | If there are two or more unrelated changes present, consider |
| 55 | breaking up the commit into two or more separate commits. |
| 56 |
| --- www/checkin.wiki | |
| +++ www/checkin.wiki | |
| @@ -41,15 +41,15 @@ | |
| 41 | within the project. Also remember to enable the localauth setting |
| 42 | if you intend to make changes via a locally served web UI. |
| 43 | |
| 44 | Item 1 is the most important step. Consider using <b>gdiff</b> |
| 45 | instead of <b>diff</b> if you have a graphical differ configured. Or |
| 46 | use the command-line option <b>--tk</b>. Also consider the <b>-v</b> |
| 47 | command-line option to show the complete text of newly added files. |
| 48 | The recommended command for completing checklist item 1 is: |
| 49 | |
| 50 | <b>fossil diff --tk -v</b> |
| 51 | |
| 52 | Look carefully at every changed line in item 1. |
| 53 | Make sure that you are not about to commit unrelated changes. |
| 54 | If there are two or more unrelated changes present, consider |
| 55 | breaking up the commit into two or more separate commits. |
| 56 |
+2
-2
| --- www/gitusers.md | ||
| +++ www/gitusers.md | ||
| @@ -808,19 +808,19 @@ | ||
| 808 | 808 | |
| 809 | 809 | The `--numstat` output is a bit cryptic, so we recommend delegating |
| 810 | 810 | this task to [the widely-available `diffstat` tool][dst], which gives |
| 811 | 811 | a histogram in its default output mode rather than bare integers: |
| 812 | 812 | |
| 813 | - fossil diff -i -N --from 2020-04-01 | diffstat | |
| 813 | + fossil diff -i -v --from 2020-04-01 | diffstat | |
| 814 | 814 | |
| 815 | 815 | We gave the `-i` flag in both cases to force Fossil to use its internal |
| 816 | 816 | diff implementation, bypassing [your local `diff-command` setting][dcset]. |
| 817 | 817 | The `--numstat` option has no effect when you have an external diff |
| 818 | 818 | command set, and some diff command alternatives like |
| 819 | 819 | [`colordiff`][cdiff] (covered [above](#cdiff)) produce output that confuses `diffstat`. |
| 820 | 820 | |
| 821 | -If you leave off the `-N` flag in the second example, the `diffstat` | |
| 821 | +If you leave off the `-v` flag in the second example, the `diffstat` | |
| 822 | 822 | output won’t include info about any newly-added files. |
| 823 | 823 | |
| 824 | 824 | [cdiff]: https://www.colordiff.org/ |
| 825 | 825 | [dcset]: https://fossil-scm.org/home/help?cmd=diff-command |
| 826 | 826 | [dst]: https://invisible-island.net/diffstat/diffstat.html |
| 827 | 827 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -808,19 +808,19 @@ | |
| 808 | |
| 809 | The `--numstat` output is a bit cryptic, so we recommend delegating |
| 810 | this task to [the widely-available `diffstat` tool][dst], which gives |
| 811 | a histogram in its default output mode rather than bare integers: |
| 812 | |
| 813 | fossil diff -i -N --from 2020-04-01 | diffstat |
| 814 | |
| 815 | We gave the `-i` flag in both cases to force Fossil to use its internal |
| 816 | diff implementation, bypassing [your local `diff-command` setting][dcset]. |
| 817 | The `--numstat` option has no effect when you have an external diff |
| 818 | command set, and some diff command alternatives like |
| 819 | [`colordiff`][cdiff] (covered [above](#cdiff)) produce output that confuses `diffstat`. |
| 820 | |
| 821 | If you leave off the `-N` flag in the second example, the `diffstat` |
| 822 | output won’t include info about any newly-added files. |
| 823 | |
| 824 | [cdiff]: https://www.colordiff.org/ |
| 825 | [dcset]: https://fossil-scm.org/home/help?cmd=diff-command |
| 826 | [dst]: https://invisible-island.net/diffstat/diffstat.html |
| 827 |
| --- www/gitusers.md | |
| +++ www/gitusers.md | |
| @@ -808,19 +808,19 @@ | |
| 808 | |
| 809 | The `--numstat` output is a bit cryptic, so we recommend delegating |
| 810 | this task to [the widely-available `diffstat` tool][dst], which gives |
| 811 | a histogram in its default output mode rather than bare integers: |
| 812 | |
| 813 | fossil diff -i -v --from 2020-04-01 | diffstat |
| 814 | |
| 815 | We gave the `-i` flag in both cases to force Fossil to use its internal |
| 816 | diff implementation, bypassing [your local `diff-command` setting][dcset]. |
| 817 | The `--numstat` option has no effect when you have an external diff |
| 818 | command set, and some diff command alternatives like |
| 819 | [`colordiff`][cdiff] (covered [above](#cdiff)) produce output that confuses `diffstat`. |
| 820 | |
| 821 | If you leave off the `-v` flag in the second example, the `diffstat` |
| 822 | output won’t include info about any newly-added files. |
| 823 | |
| 824 | [cdiff]: https://www.colordiff.org/ |
| 825 | [dcset]: https://fossil-scm.org/home/help?cmd=diff-command |
| 826 | [dst]: https://invisible-island.net/diffstat/diffstat.html |
| 827 |