Fossil SCM
Minor reordering of diff command help, per forum suggestion.
Commit
dd13191359cd7e84954e3d4b185236652651f33d5988c3c66ff04bbc64cf2dc6
Parent
89e5ac196d0dfef…
1 file changed
+4
-3
+4
-3
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -824,12 +824,13 @@ | ||
| 824 | 824 | ** The "-i" command-line option forces the use of the internal diff logic |
| 825 | 825 | ** rather than any external diff program that might be configured using |
| 826 | 826 | ** the "setting" command. If no external diff program is configured, then |
| 827 | 827 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 828 | 828 | ** |
| 829 | -** The "-N" or "--new-file" option causes the complete text of added or | |
| 830 | -** deleted files to be displayed. | |
| 829 | +** The "-v" or "--verbose" option causes the complete text of added or | |
| 830 | +** deleted files to be displayed. -N and --new-file are aliases for | |
| 831 | +** verbose mode. | |
| 831 | 832 | ** |
| 832 | 833 | ** The "--diff-binary" option enables or disables the inclusion of binary files |
| 833 | 834 | ** when using an external diff program. |
| 834 | 835 | ** |
| 835 | 836 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| @@ -847,20 +848,20 @@ | ||
| 847 | 848 | ** --diff-binary BOOL Include binary files with external commands |
| 848 | 849 | ** --exec-abs-paths Force absolute path names on external commands |
| 849 | 850 | ** --exec-rel-paths Force relative path names on external commands |
| 850 | 851 | ** --from|-r VERSION Select VERSION as source for the diff |
| 851 | 852 | ** --internal|-i Use internal diff logic |
| 852 | -** --new-file|-N Alias for --verbose | |
| 853 | 853 | ** --numstat Show only the number of lines delete and added |
| 854 | 854 | ** --side-by-side|-y Side-by-side diff |
| 855 | 855 | ** --strip-trailing-cr Strip trailing CR |
| 856 | 856 | ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") |
| 857 | 857 | ** --tk Launch a Tcl/Tk GUI for display |
| 858 | 858 | ** --to VERSION Select VERSION as target for the diff |
| 859 | 859 | ** --undo Diff against the "undo" buffer |
| 860 | 860 | ** --unified Unified diff |
| 861 | 861 | ** -v|--verbose Output complete text of added or deleted files |
| 862 | +** -N|--new-file Alias for --verbose | |
| 862 | 863 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 863 | 864 | ** -W|--width N Width of lines in side-by-side diff |
| 864 | 865 | ** -Z|--ignore-trailing-space Ignore changes to end-of-line whitespace |
| 865 | 866 | */ |
| 866 | 867 | void diff_cmd(void){ |
| 867 | 868 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -824,12 +824,13 @@ | |
| 824 | ** The "-i" command-line option forces the use of the internal diff logic |
| 825 | ** rather than any external diff program that might be configured using |
| 826 | ** the "setting" command. If no external diff program is configured, then |
| 827 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 828 | ** |
| 829 | ** The "-N" or "--new-file" option causes the complete text of added or |
| 830 | ** deleted files to be displayed. |
| 831 | ** |
| 832 | ** The "--diff-binary" option enables or disables the inclusion of binary files |
| 833 | ** when using an external diff program. |
| 834 | ** |
| 835 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| @@ -847,20 +848,20 @@ | |
| 847 | ** --diff-binary BOOL Include binary files with external commands |
| 848 | ** --exec-abs-paths Force absolute path names on external commands |
| 849 | ** --exec-rel-paths Force relative path names on external commands |
| 850 | ** --from|-r VERSION Select VERSION as source for the diff |
| 851 | ** --internal|-i Use internal diff logic |
| 852 | ** --new-file|-N Alias for --verbose |
| 853 | ** --numstat Show only the number of lines delete and added |
| 854 | ** --side-by-side|-y Side-by-side diff |
| 855 | ** --strip-trailing-cr Strip trailing CR |
| 856 | ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") |
| 857 | ** --tk Launch a Tcl/Tk GUI for display |
| 858 | ** --to VERSION Select VERSION as target for the diff |
| 859 | ** --undo Diff against the "undo" buffer |
| 860 | ** --unified Unified diff |
| 861 | ** -v|--verbose Output complete text of added or deleted files |
| 862 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 863 | ** -W|--width N Width of lines in side-by-side diff |
| 864 | ** -Z|--ignore-trailing-space Ignore changes to end-of-line whitespace |
| 865 | */ |
| 866 | void diff_cmd(void){ |
| 867 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -824,12 +824,13 @@ | |
| 824 | ** The "-i" command-line option forces the use of the internal diff logic |
| 825 | ** rather than any external diff program that might be configured using |
| 826 | ** the "setting" command. If no external diff program is configured, then |
| 827 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 828 | ** |
| 829 | ** The "-v" or "--verbose" option causes the complete text of added or |
| 830 | ** deleted files to be displayed. -N and --new-file are aliases for |
| 831 | ** verbose mode. |
| 832 | ** |
| 833 | ** The "--diff-binary" option enables or disables the inclusion of binary files |
| 834 | ** when using an external diff program. |
| 835 | ** |
| 836 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| @@ -847,20 +848,20 @@ | |
| 848 | ** --diff-binary BOOL Include binary files with external commands |
| 849 | ** --exec-abs-paths Force absolute path names on external commands |
| 850 | ** --exec-rel-paths Force relative path names on external commands |
| 851 | ** --from|-r VERSION Select VERSION as source for the diff |
| 852 | ** --internal|-i Use internal diff logic |
| 853 | ** --numstat Show only the number of lines delete and added |
| 854 | ** --side-by-side|-y Side-by-side diff |
| 855 | ** --strip-trailing-cr Strip trailing CR |
| 856 | ** --tclsh PATH Tcl/Tk used for --tk (default: "tclsh") |
| 857 | ** --tk Launch a Tcl/Tk GUI for display |
| 858 | ** --to VERSION Select VERSION as target for the diff |
| 859 | ** --undo Diff against the "undo" buffer |
| 860 | ** --unified Unified diff |
| 861 | ** -v|--verbose Output complete text of added or deleted files |
| 862 | ** -N|--new-file Alias for --verbose |
| 863 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 864 | ** -W|--width N Width of lines in side-by-side diff |
| 865 | ** -Z|--ignore-trailing-space Ignore changes to end-of-line whitespace |
| 866 | */ |
| 867 | void diff_cmd(void){ |
| 868 |