Fossil SCM
Document the new HOST:DIRECTORY option to "diff".
Commit
b92d7a43f62dae526a3e669d1c480640b8f9c9e1ae657a01be2132d77c50a2d7
Parent
6bfdfc3079be7ea…
1 file changed
+11
-2
+11
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1323,13 +1323,15 @@ | ||
| 1323 | 1323 | ** |
| 1324 | 1324 | ** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...? |
| 1325 | 1325 | ** |
| 1326 | 1326 | ** Show the difference between the current version of each of the FILEs |
| 1327 | 1327 | ** specified (as they exist on disk) and that same file as it was checked- |
| 1328 | -** out. Or if the FILE arguments are omitted, show all unsaved changes | |
| 1328 | +** out. Or if the FILE arguments are omitted, show all committed changes | |
| 1329 | 1329 | ** currently in the working check-out. The "gdiff" variant means to |
| 1330 | -** use a GUI diff. | |
| 1330 | +** use a GUI diff specified by the "gdiff-command" setting. If | |
| 1331 | +** gdiff-command is unset or is an empty string, then "gdiff" behaves | |
| 1332 | +** like "diff --tk". | |
| 1331 | 1333 | ** |
| 1332 | 1334 | ** The default output format is a "unified patch" (the same as the |
| 1333 | 1335 | ** output of "diff -u" on most unix systems). Many alternative formats |
| 1334 | 1336 | ** are available. A few of the more useful alternatives: |
| 1335 | 1337 | ** |
| @@ -1363,10 +1365,17 @@ | ||
| 1363 | 1365 | ** when using an external diff program. |
| 1364 | 1366 | ** |
| 1365 | 1367 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| 1366 | 1368 | ** as binary when considering if they should be used with the external diff |
| 1367 | 1369 | ** program. This option overrides the "binary-glob" setting. |
| 1370 | +** | |
| 1371 | +** If the "--tk" option is used (or "gdiff" is used and no third-party | |
| 1372 | +** graphical diff tool is specified) then an additional argument of | |
| 1373 | +** the form "USER@HOST:DIRECTORY" or "HOST:DIRECTORY" can be added to specify | |
| 1374 | +** a remote host and directory from which the diff should be taken. If this | |
| 1375 | +** happens, Fossil will run the diff using SSH, capture the results, then | |
| 1376 | +** display the results locally using the Tcl/Tk diff GUI. | |
| 1368 | 1377 | ** |
| 1369 | 1378 | ** These commands show differences between managed files. Use the "fossil xdiff" |
| 1370 | 1379 | ** command to see differences in unmanaged files. |
| 1371 | 1380 | ** |
| 1372 | 1381 | ** Options: |
| 1373 | 1382 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1323,13 +1323,15 @@ | |
| 1323 | ** |
| 1324 | ** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...? |
| 1325 | ** |
| 1326 | ** Show the difference between the current version of each of the FILEs |
| 1327 | ** specified (as they exist on disk) and that same file as it was checked- |
| 1328 | ** out. Or if the FILE arguments are omitted, show all unsaved changes |
| 1329 | ** currently in the working check-out. The "gdiff" variant means to |
| 1330 | ** use a GUI diff. |
| 1331 | ** |
| 1332 | ** The default output format is a "unified patch" (the same as the |
| 1333 | ** output of "diff -u" on most unix systems). Many alternative formats |
| 1334 | ** are available. A few of the more useful alternatives: |
| 1335 | ** |
| @@ -1363,10 +1365,17 @@ | |
| 1363 | ** when using an external diff program. |
| 1364 | ** |
| 1365 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| 1366 | ** as binary when considering if they should be used with the external diff |
| 1367 | ** program. This option overrides the "binary-glob" setting. |
| 1368 | ** |
| 1369 | ** These commands show differences between managed files. Use the "fossil xdiff" |
| 1370 | ** command to see differences in unmanaged files. |
| 1371 | ** |
| 1372 | ** Options: |
| 1373 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1323,13 +1323,15 @@ | |
| 1323 | ** |
| 1324 | ** Usage: %fossil diff|gdiff ?OPTIONS? ?FILE1? ?FILE2 ...? |
| 1325 | ** |
| 1326 | ** Show the difference between the current version of each of the FILEs |
| 1327 | ** specified (as they exist on disk) and that same file as it was checked- |
| 1328 | ** out. Or if the FILE arguments are omitted, show all committed changes |
| 1329 | ** currently in the working check-out. The "gdiff" variant means to |
| 1330 | ** use a GUI diff specified by the "gdiff-command" setting. If |
| 1331 | ** gdiff-command is unset or is an empty string, then "gdiff" behaves |
| 1332 | ** like "diff --tk". |
| 1333 | ** |
| 1334 | ** The default output format is a "unified patch" (the same as the |
| 1335 | ** output of "diff -u" on most unix systems). Many alternative formats |
| 1336 | ** are available. A few of the more useful alternatives: |
| 1337 | ** |
| @@ -1363,10 +1365,17 @@ | |
| 1365 | ** when using an external diff program. |
| 1366 | ** |
| 1367 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| 1368 | ** as binary when considering if they should be used with the external diff |
| 1369 | ** program. This option overrides the "binary-glob" setting. |
| 1370 | ** |
| 1371 | ** If the "--tk" option is used (or "gdiff" is used and no third-party |
| 1372 | ** graphical diff tool is specified) then an additional argument of |
| 1373 | ** the form "USER@HOST:DIRECTORY" or "HOST:DIRECTORY" can be added to specify |
| 1374 | ** a remote host and directory from which the diff should be taken. If this |
| 1375 | ** happens, Fossil will run the diff using SSH, capture the results, then |
| 1376 | ** display the results locally using the Tcl/Tk diff GUI. |
| 1377 | ** |
| 1378 | ** These commands show differences between managed files. Use the "fossil xdiff" |
| 1379 | ** command to see differences in unmanaged files. |
| 1380 | ** |
| 1381 | ** Options: |
| 1382 |