Solving conflicts

Dependencies

• [2] 2AYYR6FK Delete auto-generated files, now that this is taken care of in the deployment scripts
• [3] Y5IZKFOR Fix links and remove _org
• [4] AJ32E5LB Add custom.css to justify align content paragraphs and enable hyphenation
• [5] SCSV2FNS Reboot
• [6] GLUD3ZVF Generating the reference
• [7] QWENCR2I Script updates

Change contents

• file deletion: clone.md (-xw-x--x--)clone.md (-xw-x--x--)
  [5.49554]→[5.78331:78341](∅→∅),[5.49554]→[5.78331:78341](∅→∅),[5.78341]→[5.78342:78342](∅→∅)
  − pijul clone https://nest.pijul.com/pijul/pijul

  − ```

  −

  − ## Options

  −

  − - -h, --help

  −

  − Print a help message and exit.

  −

  − - -V, --version

  −

  − Print the version of Pijul and exit.

  −

  − - --from-branch \<from-branch\>

  −

  − Clone branch \<from-branch\> from the remote repository, instead of

  − the default branch (which is "master").

  −

  − - \<from\>

  −

  − A URI to clone. At the moment, only local paths, SSH paths (such as

  − `me@example.com:path/to/repository`) and HTTP(S) URLs are supported.

  −

  − - --patch \<patch\> …

  −

  − Pull patch \<patch\> and its dependencies. Can appear multiple times on the command line.

  −

  −

  − - -p \<port\>, --port \<port\>

  −

  − If the repository is accessed over SSH, the port of the remote SSH

  − server, defaulting to 22 (the standard SSH port).

  −

  − - --to-branch \<branch\>

  −

  − Store this branch as \<branch\> instead of using the same name as

  − the remote branch.

  −

  −

  − - [to]

  −

  − Path to the local directory where the repository will be cloned,

  − defaulting to the current directory followed by the basename of the

  − URI in <from>.
• edit in book.toml at line 7
  [5.505893]→[5.25097:25098](∅→∅)
  −
• edit in book.toml at line 8
  [5.505893]→[4.89:90](∅→∅)
  −
• resolve order conflict in book.toml at line 8
  [5.25119]

  [4.90]