Fossil SCM
Minor tweak to changes help text: move some trivia to the end so the more important material is read first
Commit
5c8bdd00c2d88d9bac077536dc4d22f284804bae
Parent
596f29fa1befc57…
1 file changed
+5
-5
+5
-5
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -387,15 +387,10 @@ | ||
| 387 | 387 | ** is enabled by default unless exactly one change type is selected. For |
| 388 | 388 | ** the purposes of determining the default, --changed counts as selecting |
| 389 | 389 | ** one change type. The default can be overridden by the --classify or |
| 390 | 390 | ** --no-classify options. |
| 391 | 391 | ** |
| 392 | -** If both --merge and --no-merge are used, --no-merge has priority. The | |
| 393 | -** same is true of --classify and --no-classify. | |
| 394 | -** | |
| 395 | -** The "fossil changes --extra" command is equivalent to "fossil extras". | |
| 396 | -** | |
| 397 | 392 | ** --edited and --updated produce disjoint sets. --updated shows a file |
| 398 | 393 | ** only when it is identical to that of its merge contributor, and the |
| 399 | 394 | ** change type classification is UPDATED_BY_MERGE or UPDATED_BY_INTEGRATE. |
| 400 | 395 | ** If the file had to be merged with any other changes, it is considered |
| 401 | 396 | ** to be merged or conflicted and therefore will be shown by --edited, not |
| @@ -406,10 +401,15 @@ | ||
| 406 | 401 | ** checked-out version and the checkout directory. In addition to the |
| 407 | 402 | ** default changes (excluding --merge), it lists extra files which (if |
| 408 | 403 | ** ignore-glob is set correctly) may be worth adding. Prior to doing a |
| 409 | 404 | ** commit, it is good practice to check --differ to see not only which |
| 410 | 405 | ** changes would be committed but also if any files should be added. |
| 406 | +** | |
| 407 | +** If both --merge and --no-merge are used, --no-merge has priority. The | |
| 408 | +** same is true of --classify and --no-classify. | |
| 409 | +** | |
| 410 | +** The "fossil changes --extra" command is equivalent to "fossil extras". | |
| 411 | 411 | ** |
| 412 | 412 | ** General options: |
| 413 | 413 | ** --abs-paths Display absolute pathnames. |
| 414 | 414 | ** --rel-paths Display pathnames relative to the current working |
| 415 | 415 | ** directory. |
| 416 | 416 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -387,15 +387,10 @@ | |
| 387 | ** is enabled by default unless exactly one change type is selected. For |
| 388 | ** the purposes of determining the default, --changed counts as selecting |
| 389 | ** one change type. The default can be overridden by the --classify or |
| 390 | ** --no-classify options. |
| 391 | ** |
| 392 | ** If both --merge and --no-merge are used, --no-merge has priority. The |
| 393 | ** same is true of --classify and --no-classify. |
| 394 | ** |
| 395 | ** The "fossil changes --extra" command is equivalent to "fossil extras". |
| 396 | ** |
| 397 | ** --edited and --updated produce disjoint sets. --updated shows a file |
| 398 | ** only when it is identical to that of its merge contributor, and the |
| 399 | ** change type classification is UPDATED_BY_MERGE or UPDATED_BY_INTEGRATE. |
| 400 | ** If the file had to be merged with any other changes, it is considered |
| 401 | ** to be merged or conflicted and therefore will be shown by --edited, not |
| @@ -406,10 +401,15 @@ | |
| 406 | ** checked-out version and the checkout directory. In addition to the |
| 407 | ** default changes (excluding --merge), it lists extra files which (if |
| 408 | ** ignore-glob is set correctly) may be worth adding. Prior to doing a |
| 409 | ** commit, it is good practice to check --differ to see not only which |
| 410 | ** changes would be committed but also if any files should be added. |
| 411 | ** |
| 412 | ** General options: |
| 413 | ** --abs-paths Display absolute pathnames. |
| 414 | ** --rel-paths Display pathnames relative to the current working |
| 415 | ** directory. |
| 416 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -387,15 +387,10 @@ | |
| 387 | ** is enabled by default unless exactly one change type is selected. For |
| 388 | ** the purposes of determining the default, --changed counts as selecting |
| 389 | ** one change type. The default can be overridden by the --classify or |
| 390 | ** --no-classify options. |
| 391 | ** |
| 392 | ** --edited and --updated produce disjoint sets. --updated shows a file |
| 393 | ** only when it is identical to that of its merge contributor, and the |
| 394 | ** change type classification is UPDATED_BY_MERGE or UPDATED_BY_INTEGRATE. |
| 395 | ** If the file had to be merged with any other changes, it is considered |
| 396 | ** to be merged or conflicted and therefore will be shown by --edited, not |
| @@ -406,10 +401,15 @@ | |
| 401 | ** checked-out version and the checkout directory. In addition to the |
| 402 | ** default changes (excluding --merge), it lists extra files which (if |
| 403 | ** ignore-glob is set correctly) may be worth adding. Prior to doing a |
| 404 | ** commit, it is good practice to check --differ to see not only which |
| 405 | ** changes would be committed but also if any files should be added. |
| 406 | ** |
| 407 | ** If both --merge and --no-merge are used, --no-merge has priority. The |
| 408 | ** same is true of --classify and --no-classify. |
| 409 | ** |
| 410 | ** The "fossil changes --extra" command is equivalent to "fossil extras". |
| 411 | ** |
| 412 | ** General options: |
| 413 | ** --abs-paths Display absolute pathnames. |
| 414 | ** --rel-paths Display pathnames relative to the current working |
| 415 | ** directory. |
| 416 |