Fossil SCM
Help-screen updates for the patch command.
Commit
5433a929821e85fc94cb9bfdfa53f3e68117b283bc532c5c25abdd1a48730b1b
Parent
e60389b0d6d5ece…
1 file changed
+8
-7
+8
-7
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -615,16 +615,12 @@ | ||
| 615 | 615 | ** |
| 616 | 616 | ** > fossil patch create [DIRECTORY] FILENAME |
| 617 | 617 | ** |
| 618 | 618 | ** Create a new binary patch in FILENAME that captures all uncommitted |
| 619 | 619 | ** changes in the check-out at DIRECTORY, or the current directory if |
| 620 | -** DIRECTORY is omitted. | |
| 621 | -** | |
| 622 | -** If FILENAME is "-" then the binary patch is written to standard | |
| 623 | -** output, preceeded by 26 bytes of header that is an ASCII | |
| 624 | -** representation of the number of bytes in the patch followed by a | |
| 625 | -** newline. | |
| 620 | +** DIRECTORY is omitted. If FILENAME is "-" then the binary patch | |
| 621 | +** is written to standard output. | |
| 626 | 622 | ** |
| 627 | 623 | ** > fossil patch apply [DIRECTORY] FILENAME |
| 628 | 624 | ** |
| 629 | 625 | ** Apply the changes in FILENAME to the check-out a DIRECTORY, or |
| 630 | 626 | ** in the current directory if DIRECTORY is omitted. Options: |
| @@ -635,11 +631,16 @@ | ||
| 635 | 631 | ** -v|--verbose Extra output explaining what happens. |
| 636 | 632 | ** |
| 637 | 633 | ** > fossil patch push REMOTE-CHECKOUT |
| 638 | 634 | ** |
| 639 | 635 | ** Create a patch for the current check-out, transfer that patch to |
| 640 | -** a remote machine (using ssh) and apply the patch there. | |
| 636 | +** a remote machine (using ssh) and apply the patch there. The | |
| 637 | +** REMOTE-CHECKOUT is in one of the following formats: | |
| 638 | +** | |
| 639 | +** * DIRECTORY | |
| 640 | +** * HOST:DIRECTORY | |
| 641 | +** * USER@HOST:DIRECTORY | |
| 641 | 642 | ** |
| 642 | 643 | ** > fossil patch pull REMOTE-CHECKOUT |
| 643 | 644 | ** |
| 644 | 645 | ** Create a patch on a remote check-out, transfer that patch to the |
| 645 | 646 | ** local machine (using ssh) and apply the patch in the local checkout. |
| 646 | 647 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -615,16 +615,12 @@ | |
| 615 | ** |
| 616 | ** > fossil patch create [DIRECTORY] FILENAME |
| 617 | ** |
| 618 | ** Create a new binary patch in FILENAME that captures all uncommitted |
| 619 | ** changes in the check-out at DIRECTORY, or the current directory if |
| 620 | ** DIRECTORY is omitted. |
| 621 | ** |
| 622 | ** If FILENAME is "-" then the binary patch is written to standard |
| 623 | ** output, preceeded by 26 bytes of header that is an ASCII |
| 624 | ** representation of the number of bytes in the patch followed by a |
| 625 | ** newline. |
| 626 | ** |
| 627 | ** > fossil patch apply [DIRECTORY] FILENAME |
| 628 | ** |
| 629 | ** Apply the changes in FILENAME to the check-out a DIRECTORY, or |
| 630 | ** in the current directory if DIRECTORY is omitted. Options: |
| @@ -635,11 +631,16 @@ | |
| 635 | ** -v|--verbose Extra output explaining what happens. |
| 636 | ** |
| 637 | ** > fossil patch push REMOTE-CHECKOUT |
| 638 | ** |
| 639 | ** Create a patch for the current check-out, transfer that patch to |
| 640 | ** a remote machine (using ssh) and apply the patch there. |
| 641 | ** |
| 642 | ** > fossil patch pull REMOTE-CHECKOUT |
| 643 | ** |
| 644 | ** Create a patch on a remote check-out, transfer that patch to the |
| 645 | ** local machine (using ssh) and apply the patch in the local checkout. |
| 646 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -615,16 +615,12 @@ | |
| 615 | ** |
| 616 | ** > fossil patch create [DIRECTORY] FILENAME |
| 617 | ** |
| 618 | ** Create a new binary patch in FILENAME that captures all uncommitted |
| 619 | ** changes in the check-out at DIRECTORY, or the current directory if |
| 620 | ** DIRECTORY is omitted. If FILENAME is "-" then the binary patch |
| 621 | ** is written to standard output. |
| 622 | ** |
| 623 | ** > fossil patch apply [DIRECTORY] FILENAME |
| 624 | ** |
| 625 | ** Apply the changes in FILENAME to the check-out a DIRECTORY, or |
| 626 | ** in the current directory if DIRECTORY is omitted. Options: |
| @@ -635,11 +631,16 @@ | |
| 631 | ** -v|--verbose Extra output explaining what happens. |
| 632 | ** |
| 633 | ** > fossil patch push REMOTE-CHECKOUT |
| 634 | ** |
| 635 | ** Create a patch for the current check-out, transfer that patch to |
| 636 | ** a remote machine (using ssh) and apply the patch there. The |
| 637 | ** REMOTE-CHECKOUT is in one of the following formats: |
| 638 | ** |
| 639 | ** * DIRECTORY |
| 640 | ** * HOST:DIRECTORY |
| 641 | ** * USER@HOST:DIRECTORY |
| 642 | ** |
| 643 | ** > fossil patch pull REMOTE-CHECKOUT |
| 644 | ** |
| 645 | ** Create a patch on a remote check-out, transfer that patch to the |
| 646 | ** local machine (using ssh) and apply the patch in the local checkout. |
| 647 |