{"header":{"message":"Solving conflicts","description":null,"timestamp":"2020-11-28T09:00:19.493894375Z","authors":[{"full_name":"Pierre-Étienne Meunier","name":"pmeunier"}]},"hash":"MNWWA2Z224PLVBURDUIXBY4SCYQE2EYXFLCY7RLU4IKKYRRPWMSAC","authors":[],"deps":{"hashes":[["MNWWA2Z224PLVBURDUIXBY4SCYQE2EYXFLCY7RLU4IKKYRRPWMSAC","Solving conflicts"],["AA",null],["2AYYR6FKMBQ7FS2U5DNFGZCYPJ2A2L7WSXKHIIYPHV5UWPM4VYYAC","Delete auto-generated files, now that this is taken care of in the deployment scripts"],["Y5IZKFOR55PEANMSPGNCMK53K6ZQSVF26DGR5BXXCPUS4S3GN2HQC","Fix links and remove _org"],["AJ32E5LBH2KX2LU4MP4S4HEQYLBQQ7XS5PDRZJEHKRNUDHAPNCTQC","Add custom.css to justify align content paragraphs and enable hyphenation"],["QWENCR2ICDOWLPJBBUCLI4VG73JJ2V64QSZABSTCIUJG6OJJG6MAC","Script updates"],["SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC","Reboot"],["GLUD3ZVF4LKZKCJJLAQ5DCQ2GDINJFPQ6ZTVPJSDMUKUY5LK2VHQC","Generating the reference"]],"deps":["2AYYR6FKMBQ7FS2U5DNFGZCYPJ2A2L7WSXKHIIYPHV5UWPM4VYYAC","Y5IZKFOR55PEANMSPGNCMK53K6ZQSVF26DGR5BXXCPUS4S3GN2HQC","AJ32E5LBH2KX2LU4MP4S4HEQYLBQQ7XS5PDRZJEHKRNUDHAPNCTQC"],"known":["SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC","GLUD3ZVF4LKZKCJJLAQ5DCQ2GDINJFPQ6ZTVPJSDMUKUY5LK2VHQC","QWENCR2ICDOWLPJBBUCLI4VG73JJ2V64QSZABSTCIUJG6OJJG6MAC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"clone.md","metadata":420},{"basename":"clone.md","metadata":420}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":49554},"to":{"change":5,"start":78331,"end":78341},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":49554},"to":{"change":5,"start":78331,"end":78341},"introduced_by":2},{"previous":"BLOCK | FOLDER | DELETED","flag":"BLOCK | FOLDER | DELETED","from":{"change":5,"pos":78341},"to":{"change":5,"start":78342,"end":78342},"introduced_by":2}],"inode":{"change":5,"pos":78342}}},"content_edges":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":78847},"to":{"change":3,"start":808,"end":855},"introduced_by":3},{"previous":"","flag":"BLOCK | DELETED","from":{"change":3,"pos":855},"to":{"change":5,"start":78898,"end":79872},"introduced_by":3}],"inode":{"change":5,"pos":78342}},"content":[{"Del":{"text":"pijul clone https://nest.pijul.com/pijul/pijul","pos":"Y5IZKFOR55PEANMSPGNCMK53K6ZQSVF26DGR5BXXCPUS4S3GN2HQC:854"}},{"Del":{"text":"```","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78901"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78902"}},{"Del":{"text":"## Options","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78913"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78914"}},{"Del":{"text":"- -h, --help","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78927"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78928"}},{"Del":{"text":" Print a help message and exit.","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78961"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78962"}},{"Del":{"text":"- -V, --version","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78978"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:78979"}},{"Del":{"text":" Print the version of Pijul and exit.","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79018"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79019"}},{"Del":{"text":"- --from-branch \\","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79051"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79052"}},{"Del":{"text":" Clone branch \\ from the remote repository, instead of","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79122"}},{"Del":{"text":" the default branch (which is \"master\").","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79164"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79165"}},{"Del":{"text":"- \\","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79176"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79177"}},{"Del":{"text":" A URI to clone. At the moment, only local paths, SSH paths (such as","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79247"}},{"Del":{"text":" `me@example.com:path/to/repository`) and HTTP(S) URLs are supported.","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79318"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79319"}},{"Del":{"text":"- --patch \\ …","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79343"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79344"}},{"Del":{"text":" Pull patch \\ and its dependencies. Can appear multiple times on the command line.","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79436"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79437"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79438"}},{"Del":{"text":"- -p \\, --port \\","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79469"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79470"}},{"Del":{"text":" If the repository is accessed over SSH, the port of the remote SSH","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79539"}},{"Del":{"text":" server, defaulting to 22 (the standard SSH port).","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79591"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79592"}},{"Del":{"text":"- --to-branch \\","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79617"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79618"}},{"Del":{"text":" Store this branch as \\ instead of using the same name as","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79686"}},{"Del":{"text":" the remote branch.","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79707"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79708"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79709"}},{"Del":{"text":"- [to]","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79716"}},{"Del":{"text":"","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79717"}},{"Del":{"text":" Path to the local directory where the repository will be cloned,","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79784"}},{"Del":{"text":" defaulting to the current directory followed by the basename of the","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79854"}},{"Del":{"text":" URI in .","pos":"SCSV2FNSTQ4FVACUQZM4EISV72FP5SEBGKGMLQB3323KHSCDP67QC:79871"}}]}},{"Edit":{"inode":{"change":5,"pos":505771},"path":"book.toml","line":7,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":505893},"to":{"change":5,"start":25097,"end":25098},"introduced_by":5}],"inode":{"change":5,"pos":505771}}},"contents":[{"Del":{"text":"","pos":"GLUD3ZVF4LKZKCJJLAQ5DCQ2GDINJFPQ6ZTVPJSDMUKUY5LK2VHQC:25097"}}]}},{"Edit":{"inode":{"change":5,"pos":505771},"path":"book.toml","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":5,"pos":505893},"to":{"change":4,"start":89,"end":90},"introduced_by":4}],"inode":{"change":5,"pos":505771}}},"contents":[{"Del":{"text":"","pos":"AJ32E5LBH2KX2LU4MP4S4HEQYLBQQ7XS5PDRZJEHKRNUDHAPNCTQC:89"}}]}},{"SolveOrderConflict":{"inode":{"change":5,"pos":505771},"path":"book.toml","line":8,"atom":{"NewVertex":{"up_context":[{"change":5,"pos":25119}],"down_context":[{"change":4,"pos":90}],"flag":"","start":0,"end":0,"inode":{"change":5,"pos":505771}}},"contents":[{"Add":{"text":"","pos":"MNWWA2Z224PLVBURDUIXBY4SCYQE2EYXFLCY7RLU4IKKYRRPWMSAC:0"}}]}}],"owner":"pijul","repo":"manual","token":"G20JmL0a+EpZBRDaLQwQghyi41adFgxpWNbeQtxfT4w=","login":null}

…

Dependencies

Change contents

Review